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/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c
index dad1c033d..5068bd37a 100644
--- a/src/post/visualizations/fftgraph.c
+++ b/src/post/visualizations/fftgraph.c
@@ -19,9 +19,6 @@
  *
  * FftGraph Visualization Post Plugin For xine
  *   by Thibaut Mattern (tmattern@noos.fr)
- *
- * $Id: fftgraph.c,v 1.15 2006/12/02 22:35:18 miguelfreitas Exp $
- *
  */
 
 #include <stdio.h>
diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c
index 4c7d41dde..ba34437f5 100644
--- a/src/post/visualizations/fftscope.c
+++ b/src/post/visualizations/fftscope.c
@@ -21,9 +21,6 @@
  *   by Mike Melanson (melanson@pcisys.net)
  *
  * FFT code by Steve Haehnichen, originally licensed under GPL v1
- *
- * $Id: fftscope.c,v 1.30 2006/12/02 22:35:18 miguelfreitas Exp $
- *
  */
 
 #include <stdio.h>
diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c
index c287408e9..21854afc6 100644
--- a/src/post/visualizations/fooviz.c
+++ b/src/post/visualizations/fooviz.c
@@ -22,9 +22,6 @@
  * This is an example/template for the xine visualization post plugin
  * process. It simply paints the screen a solid color and rotates through
  * colors on each iteration.
- *
- * $Id: fooviz.c,v 1.28 2006/12/02 22:35:18 miguelfreitas Exp $
- *
  */
 
 #include <stdio.h>
diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index b96962fb9..a435604d4 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -19,9 +19,6 @@
  *
  * Basic Oscilloscope Visualization Post Plugin For xine
  *   by Mike Melanson (melanson@pcisys.net)
- *
- * $Id: oscope.c,v 1.21 2006/12/02 22:35:18 miguelfreitas Exp $
- *
  */
 
 #include <stdio.h>
diff --git a/src/post/visualizations/visualizations.c b/src/post/visualizations/visualizations.c
index 72180a67b..a26f0bd5b 100644
--- a/src/post/visualizations/visualizations.c
+++ b/src/post/visualizations/visualizations.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * This file contains plugin entries for several visualization post plugins.
- *
- * $Id: visualizations.c,v 1.14 2006/07/10 22:08:44 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/post/visualizations/visualizations.h b/src/post/visualizations/visualizations.h
index c6ea96f1d..39d02e1cb 100644
--- a/src/post/visualizations/visualizations.h
+++ b/src/post/visualizations/visualizations.h
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * This file contains plugin entries for several visualization post plugins.
- *
- * $Id: visualizations.h,v 1.1 2003/10/30 22:40:53 mroi Exp $
  */
 
 #include "xine_internal.h"