Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'

[ffmpeg] / libavformat / dtsdec.c

diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c
index d054f4353770381356c14838bd0218257038920d..50b14c66356b61de99e581b5ba069d1e386f0273 100644 (file)
--- a/libavformat/dtsdec.c
+++ b/libavformat/dtsdec.c
@@ -20,16 +20,13 @@
  */
 
 #include "libavcodec/bytestream.h"
-#include "libavcodec/get_bits.h"
 #include "libavcodec/dca.h"
+#include "libavcodec/dca_syncwords.h"
+#include "libavcodec/get_bits.h"
+
 #include "avformat.h"
 #include "rawdec.h"
 
-#define DCA_MARKER_14B_BE 0x1FFFE800
-#define DCA_MARKER_14B_LE 0xFF1F00E8
-#define DCA_MARKER_RAW_BE 0x7FFE8001
-#define DCA_MARKER_RAW_LE 0xFE7F0180
-
 static int dts_probe(AVProbeData *p)
 {
     const uint8_t *buf, *bufp;
@@ -53,18 +50,18 @@ static int dts_probe(AVProbeData *p)
             diff += FFABS(((int16_t)AV_RL16(buf)) - (int16_t)AV_RL16(buf-4));
 
         /* regular bitstream */
-        if (state == DCA_MARKER_RAW_BE)
+        if (state == DCA_SYNCWORD_CORE_BE)
             marker = 0;
-        else if (state == DCA_MARKER_RAW_LE)
+        else if (state == DCA_SYNCWORD_CORE_LE)
             marker = 1;
 
         /* 14 bits big-endian bitstream */
-        else if (state == DCA_MARKER_14B_BE &&
+        else if (state == DCA_SYNCWORD_CORE_14B_BE &&
                  (bytestream_get_be16(&bufp) & 0xFFF0) == 0x07F0)
             marker = 2;
 
         /* 14 bits little-endian bitstream */
-        else if (state == DCA_MARKER_14B_LE &&
+        else if (state == DCA_SYNCWORD_CORE_14B_LE &&
                  (bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007)
             marker = 3;
         else