diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-18 16:58:51 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-18 16:58:51 +0200 |
| commit | b502e15322d2fe9c41645a0905683e7783cf2a30 (patch) | |
| tree | af21b809bc370480252c3f3c6b16ee8446745d1b /src/libdts | |
| parent | f26e3cfb631fb748f712bfcf064ce907d68aa7c3 (diff) | |
| download | xine-lib-b502e15322d2fe9c41645a0905683e7783cf2a30.tar.gz xine-lib-b502e15322d2fe9c41645a0905683e7783cf2a30.tar.bz2 | |
Permit to build against libdca 0.0.5.
To build against this, we need to make sure that the system dts.h header is
used instead of the internal copy of it, as the internal copy will declare
the functions with the old names, while libdca's system header will create
macro aliases between the old names and the new ones.
Better fix will be implemented in 1.2 series.
--HG--
rename : src/libdts/dts.h => src/libdts/internal-dts.h
Diffstat (limited to 'src/libdts')
| -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 |