diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-10 23:17:58 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-10 23:17:58 +0000 |
| commit | 840d2394b9d4199a90dbb2f15b907ecdf3ffc0bc (patch) | |
| tree | d61c21fae3e3c58b78d83207a5816f4814ba7bf2 /src/libxineadec | |
| parent | 6163126d81baaac024bc55ddfc34941bc6d2778d (diff) | |
| parent | 3c175fd21df04c5c0afa160f81aea0c305f69dc5 (diff) | |
| download | xine-lib-840d2394b9d4199a90dbb2f15b907ecdf3ffc0bc.tar.gz xine-lib-840d2394b9d4199a90dbb2f15b907ecdf3ffc0bc.tar.bz2 | |
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
Diffstat (limited to 'src/libxineadec')
| -rw-r--r-- | src/libxineadec/fooaudio.c | 2 | ||||
| -rw-r--r-- | src/libxineadec/gsm610.c | 3 | ||||
| -rw-r--r-- | src/libxineadec/xine_a52_decoder.c | 2 | ||||
| -rw-r--r-- | src/libxineadec/xine_faad_decoder.c | 3 | ||||
| -rw-r--r-- | src/libxineadec/xine_mad_decoder.c | 2 |
5 files changed, 0 insertions, 12 deletions
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c index 2174f1799..5ab4fa1f6 100644 --- a/src/libxineadec/fooaudio.c +++ b/src/libxineadec/fooaudio.c @@ -20,8 +20,6 @@ * fooaudio.c: This is a reference audio decoder for the xine multimedia * player. It really works too! It will output a continuous sine wave in * place of the data it should actually send. - * - * $Id: fooaudio.c,v 1.18 2006/07/10 22:08:43 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index f54c56924..84d28cc3a 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -43,9 +43,6 @@ * Jutta Degener * Carsten Bormann * -------------------------------------------------------------------- - * - * $Id: gsm610.c,v 1.19 2006/07/10 22:08:43 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c index 35e34eb57..bb4bdba29 100644 --- a/src/libxineadec/xine_a52_decoder.c +++ b/src/libxineadec/xine_a52_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.81 2007/02/20 00:34:57 dgp85 Exp $ - * * stuff needed to turn liba52 into a xine decoder plugin */ diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index f9a16541d..4a2097ec4 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -16,9 +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: xine_decoder.c,v 1.49 2007/02/20 00:34:57 dgp85 Exp $ - * */ #include <stdlib.h> diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index 6b13052c5..2057505e8 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_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.57 2006/07/10 22:08:29 dgp85 Exp $ - * * stuff needed to turn libmad into a xine decoder plugin */ |