summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/libdts/Makefile.am2
-rw-r--r--src/libdts/internal-dts.h (renamed from src/libdts/dts.h)0
-rw-r--r--src/libdts/xine_dts_decoder.c7
4 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0120a216f..4759efe4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+xine-lib (1.1.7) (unreleased)
+ * Support libdca (new name for libdts) by shuffling around the dts.h file.
+
xine-lib (1.1.6)
* Split the DirectFB plugin into X11 and non-X versions.
* Improve the Mac OS X video output plugin. Thanks to Matt Messier.
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