summaryrefslogtreecommitdiff
path: root/src/audio_out/audio_directx_out.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-11-10 23:17:58 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-11-10 23:17:58 +0000
commit840d2394b9d4199a90dbb2f15b907ecdf3ffc0bc (patch)
treed61c21fae3e3c58b78d83207a5816f4814ba7bf2 /src/audio_out/audio_directx_out.c
parent6163126d81baaac024bc55ddfc34941bc6d2778d (diff)
parent3c175fd21df04c5c0afa160f81aea0c305f69dc5 (diff)
downloadxine-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/audio_out/audio_directx_out.c')
-rw-r--r--[-rwxr-xr-x]src/audio_out/audio_directx_out.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index 89fb8f7e9..77e3e15b9 100755..100644
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -19,8 +19,6 @@
*
* audio_directx_out.c, direct sound audio output plugin for xine
* by Matthew Grooms <elon@altavista.com>
- *
- * $Id: audio_directx_out.c,v 1.17 2006/09/21 15:01:08 valtri Exp $
*/
/*