Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'

* commit '25f613f8be3b51e4396b93cda131e4631ba54302':
  dca: Move syncword definitions to a separate header

Conflicts:
	libavcodec/dca_parser.c
	libavformat/dtsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 6 insertions, 5 deletions

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 22be88fe1a..8dd043088e 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -28,6 +28,7 @@
 #include "libavutil/error.h"
 
 #include "dca.h"
+#include "dca_syncwords.h"
 #include "put_bits.h"
 
 const uint32_t avpriv_dca_sample_rates[16] = {
@@ -49,18 +50,18 @@ int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
 
     mrk = AV_RB32(src);
     switch (mrk) {
-    case DCA_MARKER_RAW_BE:
+    case DCA_SYNCWORD_CORE_BE:
         memcpy(dst, src, src_size);
         return src_size;
-    case DCA_MARKER_RAW_LE:
+    case DCA_SYNCWORD_CORE_LE:
         for (i = 0; i < (src_size + 1) >> 1; i++)
             *sdst++ = av_bswap16(*ssrc++);
         return src_size;
-    case DCA_MARKER_14B_BE:
-    case DCA_MARKER_14B_LE:
+    case DCA_SYNCWORD_CORE_14B_BE:
+    case DCA_SYNCWORD_CORE_14B_LE:
         init_put_bits(&pb, dst, max_size);
         for (i = 0; i < (src_size + 1) >> 1; i++, src += 2) {
-            tmp = ((mrk == DCA_MARKER_14B_BE) ? AV_RB16(src) : AV_RL16(src)) & 0x3FFF;
+            tmp = ((mrk == DCA_SYNCWORD_CORE_14B_BE) ? AV_RB16(src) : AV_RL16(src)) & 0x3FFF;
             put_bits(&pb, 14, tmp);
         }
         flush_put_bits(&pb);