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/audio_out/audio_oss_out.c | |
| 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/audio_out/audio_oss_out.c')
| -rw-r--r-- | src/audio_out/audio_oss_out.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index f5f6f8153..a6e0fe494 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.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: audio_oss_out.c,v 1.120 2007/03/17 06:59:31 dgp85 Exp $ - * * 20-8-2001 First implementation of Audio sync and Audio driver separation. * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk * @@ -34,7 +32,6 @@ * when dealing with audio_bytes instead of audio_frames. * * The number of samples passed to/from the audio driver is also sent in units of audio_frames. - * */ #ifdef HAVE_CONFIG_H |