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, 16 deletions

diff --git a/src/post/audio/audio_filters.c b/src/post/audio/audio_filters.c
index 68c48a479..8200db51b 100644
--- a/src/post/audio/audio_filters.c
+++ b/src/post/audio/audio_filters.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: audio_filters.c,v 1.7 2006/07/10 22:08:44 dgp85 Exp $
- *
  * catalog for audio filter plugins
  */
 
diff --git a/src/post/audio/audio_filters.h b/src/post/audio/audio_filters.h
index ced5e27b7..6c064945a 100644
--- a/src/post/audio/audio_filters.h
+++ b/src/post/audio/audio_filters.h
@@ -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: audio_filters.h,v 1.3 2006/02/05 20:38:37 miguelfreitas Exp $
- *
  * catalog for audio filter plugins
  */
 
diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
index d8b174b4f..5aa7a0617 100644
--- a/src/post/audio/stretch.c
+++ b/src/post/audio/stretch.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * Time stretch by a given factor, optionally preserving pitch
- *
- * $Id: stretch.c,v 1.8 2006/01/27 07:46:12 tmattern Exp $
- *
  */
 
 #include <stdio.h>
diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
index fe8c4a762..e1b2afbe3 100644
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -22,9 +22,6 @@
  * This is an up-mix audio filter post plugin.
  * It simply creates output channels to match the speaker arrangement.
  * E.g. Converts Stereo into Surround 5.1
- *
- * $Id: upmix.c,v 1.17 2006/01/27 07:46:12 tmattern Exp $
- *
  */
 
 #include <stdio.h>
diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
index c6f53acb2..195831123 100644
--- a/src/post/audio/upmix_mono.c
+++ b/src/post/audio/upmix_mono.c
@@ -21,9 +21,6 @@
  *   (c) 2004 James Courtier-Dutton (James@superbug.demon.co.uk)
  * This is an up-mix audio filter post plugin.
  * It simply converts Mono into Stereo.
- *
- * $Id: upmix_mono.c,v 1.5 2006/01/27 07:46:12 tmattern Exp $
- *
  */
 
 #include <stdio.h>
diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c
index 866dd87ae..783c1e26d 100644
--- a/src/post/audio/volnorm.c
+++ b/src/post/audio/volnorm.c
@@ -20,9 +20,6 @@
  * Volume normalization audio filter for xine.  Ported by Jason Tackaberry
  * from MPlayer's af_volnorm, which is copyright 2004 by Alex Beregszaszi 
  * & Pierre Lombard.
- *
- * $Id: volnorm.c,v 1.1 2006/02/05 20:38:37 miguelfreitas Exp $
- *
  */
 
 #include <stdio.h>