summaryrefslogtreecommitdiff
path: root/src/libdts
diff options
context:
space:
mode:
Diffstat (limited to 'src/libdts')
-rw-r--r--src/libdts/Makefile.am2
-rw-r--r--src/libdts/bitstream.c2
-rw-r--r--src/libdts/downmix.c2
-rw-r--r--src/libdts/internal-dts.h (renamed from src/libdts/dts.h)0
-rw-r--r--src/libdts/parse.c2
-rw-r--r--src/libdts/xine_dts_decoder.c7
6 files changed, 10 insertions, 5 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/bitstream.c b/src/libdts/bitstream.c
index 8a5c4caac..50b2b9fe8 100644
--- a/src/libdts/bitstream.c
+++ b/src/libdts/bitstream.c
@@ -26,7 +26,7 @@
#include <inttypes.h>
-#include "dts.h"
+#include "internal-dts.h"
#include "dts_internal.h"
#include "bitstream.h"
diff --git a/src/libdts/downmix.c b/src/libdts/downmix.c
index 3614c5e8b..fe7136a72 100644
--- a/src/libdts/downmix.c
+++ b/src/libdts/downmix.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <inttypes.h>
-#include "dts.h"
+#include "internal-dts.h"
#include "dts_internal.h"
#define CONVERT(acmod,output) (((output) << DTS_CHANNEL_BITS) + (acmod))
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/parse.c b/src/libdts/parse.c
index 3806a5594..67067addb 100644
--- a/src/libdts/parse.c
+++ b/src/libdts/parse.c
@@ -34,7 +34,7 @@
#define M_PI 3.1415926535897932384626433832795029
#endif
-#include "dts.h"
+#include "internal-dts.h"
#include "dts_internal.h"
#include "bitstream.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