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

8 files changed, 0 insertions, 20 deletions

diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c
index 9bdc2536b..f7206b583 100644
--- a/src/input/libreal/asmrp.c
+++ b/src/input/libreal/asmrp.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: asmrp.c,v 1.10 2006/12/25 15:39:31 dgp85 Exp $
- *
  * a parser for real's asm rules
  *
  * grammar for these rules:
diff --git a/src/input/libreal/asmrp.h b/src/input/libreal/asmrp.h
index 18dd0a314..dcc373bd0 100644
--- a/src/input/libreal/asmrp.h
+++ b/src/input/libreal/asmrp.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: asmrp.h,v 1.3 2006/11/29 19:43:01 dgp85 Exp $
- *
  * a parser for real's asm rules
  *
  * grammar for these rules:
diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index ef2d266e8..9ea65d9df 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -17,11 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: real.c,v 1.26 2007/01/19 01:19:06 dgp85 Exp $
- *
  * special functions for real streams.
  * adopted from joschkas real tools.
- *
  */
 
 #include <stdio.h>
diff --git a/src/input/libreal/real.h b/src/input/libreal/real.h
index bc6078379..edcd170f8 100644
--- a/src/input/libreal/real.h
+++ b/src/input/libreal/real.h
@@ -17,11 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: real.h,v 1.5 2004/04/24 16:55:42 miguelfreitas Exp $
- *
  * special functions for real streams.
  * adopted from joschkas real tools.
- *
  */
  
 #ifndef HAVE_REAL_H
diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index 6a9854f61..159b81ee6 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.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: rmff.c,v 1.8 2006/06/20 01:07:58 dgp85 Exp $
- *
  * functions for real media file format
  * adopted from joschkas real tools
  */
diff --git a/src/input/libreal/rmff.h b/src/input/libreal/rmff.h
index 29c519a13..d39942088 100644
--- a/src/input/libreal/rmff.h
+++ b/src/input/libreal/rmff.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: rmff.h,v 1.5 2004/04/06 19:20:16 valtri Exp $
- *
  * some functions for real media file headers
  * adopted from joschkas real tools
  */
diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c
index 30977223e..c62b6bbc1 100644
--- a/src/input/libreal/sdpplin.c
+++ b/src/input/libreal/sdpplin.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: sdpplin.c,v 1.8 2006/12/25 16:21:56 dgp85 Exp $
- *
  * sdp/sdpplin parser.
- *
  */
  
 #define LOG_MODULE "sdpplin"
diff --git a/src/input/libreal/sdpplin.h b/src/input/libreal/sdpplin.h
index e6994642b..cb3b434d4 100644
--- a/src/input/libreal/sdpplin.h
+++ b/src/input/libreal/sdpplin.h
@@ -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: sdpplin.h,v 1.2 2003/12/09 00:02:30 f1rmb Exp $
- *
  * sdp/sdpplin parser.
- *
  */
  
 #ifndef HAVE_SDPPLIN_H