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/xine-engine/resample.h | |
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/xine-engine/resample.h')
-rw-r--r-- | src/xine-engine/resample.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xine-engine/resample.h b/src/xine-engine/resample.h index c291917b6..40b4de486 100644 --- a/src/xine-engine/resample.h +++ b/src/xine-engine/resample.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: resample.h,v 1.6 2006/09/26 05:19:49 dgp85 Exp $ - * * utilitiy functions for audio drivers * * FIXME: not all of them are implemented yet |