diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-21 23:37:04 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-21 23:37:04 +0000 |
| commit | bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1 (patch) | |
| tree | 9a357059c3433584140c561c5c61421861181002 /src/audio_dec | |
| parent | 57513400ce106f016e43c966900e5215d0304010 (diff) | |
| parent | a9a29bda1ddcec1ad8fa1305987a669404075c26 (diff) | |
| download | xine-lib-bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1.tar.gz xine-lib-bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libdts/xine_dts_decoder.c => src/audio_dec/xine_dts_decoder.c
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
Diffstat (limited to 'src/audio_dec')
| -rw-r--r-- | src/audio_dec/xine_dts_decoder.c | 8 | ||||
| -rw-r--r-- | src/audio_dec/xine_lpcm_decoder.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/audio_dec/xine_dts_decoder.c b/src/audio_dec/xine_dts_decoder.c index ffacf4a94..9711650a4 100644 --- a/src/audio_dec/xine_dts_decoder.c +++ b/src/audio_dec/xine_dts_decoder.c @@ -26,10 +26,6 @@ * @author James Courtier-Dutton (2001-12-09) */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifndef __sun /* required for swab() */ #define _XOPEN_SOURCE 500 @@ -37,6 +33,10 @@ /* avoid compiler warnings */ #define _BSD_SOURCE 1 +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/src/audio_dec/xine_lpcm_decoder.c b/src/audio_dec/xine_lpcm_decoder.c index 59f847f5c..db4a79fff 100644 --- a/src/audio_dec/xine_lpcm_decoder.c +++ b/src/audio_dec/xine_lpcm_decoder.c @@ -25,16 +25,16 @@ * @date 2001-08-31 Added LPCM rate sensing */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifndef __sun #define _XOPEN_SOURCE 500 #endif /* avoid compiler warnings */ #define _BSD_SOURCE 1 +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <unistd.h> #include <string.h> |