diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-18 17:03:18 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-18 17:03:18 +0200 |
| commit | 1b589783e8f1bf896a4dc8fdcdfe854e37a57270 (patch) | |
| tree | 8f93dfc9665f0eb6c166a73bb5f88159953b1e50 /src | |
| parent | 0bbc4497a72dca89f178349b76fca6ea92bbf17f (diff) | |
| parent | b502e15322d2fe9c41645a0905683e7783cf2a30 (diff) | |
| download | xine-lib-1b589783e8f1bf896a4dc8fdcdfe854e37a57270.tar.gz xine-lib-1b589783e8f1bf896a4dc8fdcdfe854e37a57270.tar.bz2 | |
Merge from 1.1 series.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libdts/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libdts/internal-dts.h (renamed from src/libdts/dts.h) | 0 | ||||
| -rw-r--r-- | src/libdts/xine_dts_decoder.c | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am index 207755f1f..ea09aab2e 100644 --- a/src/libdts/Makefile.am +++ b/src/libdts/Makefile.am @@ -24,5 +24,5 @@ else xineplug_decode_dts_la_LIBADD = $(XINE_LIB) -lm endif -noinst_HEADERS = bitstream.h dts.h dts_internal.h tables.h tables_adpcm.h \ +noinst_HEADERS = bitstream.h internal-dts.h dts_internal.h tables.h tables_adpcm.h \ tables_fir.h tables_huffman.h tables_quantization.h tables_vq.h diff --git a/src/libdts/dts.h b/src/libdts/internal-dts.h index 30f3a197b..30f3a197b 100644 --- a/src/libdts/dts.h +++ b/src/libdts/internal-dts.h diff --git a/src/libdts/xine_dts_decoder.c b/src/libdts/xine_dts_decoder.c index 902d8c5b6..0ef9afa17 100644 --- a/src/libdts/xine_dts_decoder.c +++ b/src/libdts/xine_dts_decoder.c @@ -49,7 +49,12 @@ #include "xineutils.h" #include "audio_out.h" #include "buffer.h" -#include "dts.h" + +#ifdef HAVE_DTS_H +# include <dts.h> +#else +# include "internal-dts.h" +#endif #define MAX_AC5_FRAME 4096 |