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/input/vcd | |
| 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/input/vcd')
| -rw-r--r-- | src/input/vcd/xine-extra.c | 1 | ||||
| -rw-r--r-- | src/input/vcd/xine-extra.h | 1 | ||||
| -rw-r--r-- | src/input/vcd/xineplug_inp_vcd.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/input/vcd/xine-extra.c b/src/input/vcd/xine-extra.c index b0423a913..79c962a79 100644 --- a/src/input/vcd/xine-extra.c +++ b/src/input/vcd/xine-extra.c @@ -1,5 +1,4 @@ /* - $Id: xine-extra.c,v 1.5 2006/09/09 17:41:45 dgp85 Exp $ Copyright (C) 2002 Rocky Bernstein <rocky@panix.com> diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h index f4051cf52..0650f863d 100644 --- a/src/input/vcd/xine-extra.h +++ b/src/input/vcd/xine-extra.h @@ -1,5 +1,4 @@ /* - $Id: xine-extra.h,v 1.2 2006/04/21 23:15:45 dsalt Exp $ Copyright (C) 2002 Rocky Bernstein <rocky@panix.com> diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index ecd0b020a..474cc7339 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1,5 +1,4 @@ /* - $Id: xineplug_inp_vcd.c,v 1.53 2007/02/08 02:40:23 dsalt Exp $ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> |