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

11 files changed, 0 insertions, 24 deletions

diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c
index 5cb463323..0f71a287d 100644
--- a/src/combined/nsf_combined.c
+++ b/src/combined/nsf_combined.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * $Id: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $
  */
 
 #include "xine_internal.h"
diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c
index f2cf7ff8b..a809ff9cc 100644
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -19,8 +19,6 @@
  *
  * NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte
  *   http://www.baisoku.org/
- *
- * $Id: nsf.c,v 1.13 2006/09/25 23:56:31 dgp85 Exp $
  */
 
 #include <stdio.h>
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index 5f2be8899..95897e3ac 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -29,8 +29,6 @@
  *
  * For more information regarding the NSF format, visit:
  *   http://www.tripoint.org/kevtris/nes/nsfspec.txt
- *
- * $Id: demux_nsf.c,v 1.24 2007/03/29 17:03:06 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c
index 020488a90..e7a1bc76a 100644
--- a/src/combined/wavpack_combined.c
+++ b/src/combined/wavpack_combined.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
- *
- * $Id: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $
  */
 
 #include "xine_internal.h"
diff --git a/src/combined/wavpack_combined.h b/src/combined/wavpack_combined.h
index a591d26a0..264609bf2 100644
--- a/src/combined/wavpack_combined.h
+++ b/src/combined/wavpack_combined.h
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
- *
- * $Id: combined_wavpack.h,v 1.3 2007/03/17 07:34:02 dgp85 Exp $
  */
 
 #include "os_types.h"
diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c
index e174bd809..2bd0339d8 100644
--- a/src/combined/wavpack_decoder.c
+++ b/src/combined/wavpack_decoder.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
- *
- * $Id: decoder_wavpack.c,v 1.14 2007/03/29 19:45:33 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 597a7a6bc..4b8300d44 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
- *
- * $Id: demux_wavpack.c,v 1.11 2007/03/17 07:34:02 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index 36971507b..973f02a47 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -19,10 +19,7 @@
  */
 
 /*
- * $Id: demux_ogg.c,v 1.177 2007/03/29 19:38:51 dgp85 Exp $
- *
  * demultiplexer for ogg streams
- *
  */
 /* 2003.02.09 (dilb) update of the handling for audio/video infos for strongarm cpus. */
 
diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c
index fe004faa8..fa1ede0f2 100644
--- a/src/combined/xine_speex_decoder.c
+++ b/src/combined/xine_speex_decoder.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: xine_decoder.c,v 1.22 2007/01/19 01:48:05 dgp85 Exp $
- *
  * (ogg/)speex audio decoder plugin (libspeex wrapper) for xine
  */
 
diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c
index 0959a5411..9fd3d6416 100644
--- a/src/combined/xine_theora_decoder.c
+++ b/src/combined/xine_theora_decoder.c
@@ -17,10 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: xine_decoder.c,v 1.26 2006/07/10 22:08:30 dgp85 Exp $
- *
  * xine decoder plugin using libtheora
- *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c
index 394f76048..ef6d94d06 100644
--- a/src/combined/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.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: xine_decoder.c,v 1.48 2006/12/04 13:59:38 dgp85 Exp $
- *
  * (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine
  */