Merge from 1.1.

--HG--
rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c
rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h
rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c
rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
rename : src/liba52/xine_a52_decoder.c => src/libxineadec/xine_a52_decoder.c
rename : src/libdts/xine_dts_decoder.c => src/libxineadec/xine_dts_decoder.c
rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c
rename : src/libmad/xine_mad_decoder.c => src/libxineadec/xine_mad_decoder.c
rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c

6 files changed, 0 insertions, 12 deletions

diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c
index 6e982d671..b6940813f 100644
--- a/src/libxinevdec/bitplane.c
+++ b/src/libxinevdec/bitplane.c
@@ -27,8 +27,6 @@
  * - IFF ANIM compression methods OPT 5, 7 (long and short) and
  *   8 (long and short)
  * - untested (found no testfiles) IFF-ANIM OPT 3, 4 and 6
- *
- * $Id: bitplane.c,v 1.15 2006/07/10 22:08:43 dgp85 Exp $
  */
 
 #include <stdio.h>
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index 4af8b7c73..98e0ebc0b 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -22,8 +22,6 @@
  * where each byte in the map is the same value, which is 3 larger than the
  * value from the last frame. This creates a slowly rotating solid color
  * frame when the frames are played in succession.
- *
- * $Id: foovideo.c,v 1.26 2006/07/10 22:08:43 dgp85 Exp $
  */
 
 #include <stdio.h>
diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c
index 837ca1fbd..b5acdfa42 100644
--- a/src/libxinevdec/gdkpixbuf.c
+++ b/src/libxinevdec/gdkpixbuf.c
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: gdkpixbuf.c,v 1.7 2006/08/05 13:31:13 hadess Exp $
- *
  * a gdk-pixbuf-based image video decoder
  */
 
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c
index 42417c726..a338e3cab 100644
--- a/src/libxinevdec/image.c
+++ b/src/libxinevdec/image.c
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: image.c,v 1.21 2006/10/16 22:18:24 valtri Exp $
- *
  * a image video decoder
  */
 
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index fd6e2739c..0e7be4c18 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -29,8 +29,6 @@
  *
  * One more catch: Raw RGB from a Microsoft file is upside down. This is 
  * indicated by a negative height parameter.
- * 
- * $Id: rgb.c,v 1.34 2006/07/10 22:08:43 dgp85 Exp $
  */
 
 #include <stdio.h>
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index 3a4814bdc..2b8657685 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -20,8 +20,6 @@
  * YUV "Decoder" by Mike Melanson (melanson@pcisys.net)
  * Actually, this decoder just reorganizes chunks of raw YUV data in such
  * a way that xine can display them.
- * 
- * $Id: yuv.c,v 1.37 2006/07/10 22:08:43 dgp85 Exp $
  */
 
 #include <stdio.h>