Combine deprecation guards where appropriate

[ffmpeg] / libavformat / dtsdec.c

diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c
index c8da0d41ad00aa5e3e8198b521db8b58f28ff775..90e9d385822dec627b2b7b5f2d465fe44b092c4a 100644 (file)
--- a/libavformat/dtsdec.c
+++ b/libavformat/dtsdec.c
@@ -20,14 +20,11 @@
  */
 
 #include "libavcodec/bytestream.h"
+#include "libavcodec/dca_syncwords.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;
@@ -42,16 +39,16 @@ static int dts_probe(AVProbeData *p)
         state = (state << 16) | bytestream_get_be16(&bufp);
 
         /* regular bitstream */
-        if (state == DCA_MARKER_RAW_BE || state == DCA_MARKER_RAW_LE)
+        if (state == DCA_SYNCWORD_CORE_BE || state == DCA_SYNCWORD_CORE_LE)
             markers[0]++;
 
         /* 14 bits big-endian bitstream */
-        if (state == DCA_MARKER_14B_BE)
+        if (state == DCA_SYNCWORD_CORE_14B_BE)
             if ((bytestream_get_be16(&bufp) & 0xFFF0) == 0x07F0)
                 markers[1]++;
 
         /* 14 bits little-endian bitstream */
-        if (state == DCA_MARKER_14B_LE)
+        if (state == DCA_SYNCWORD_CORE_14B_LE)
             if ((bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007)
                 markers[2]++;
     }
@@ -60,7 +57,7 @@ static int dts_probe(AVProbeData *p)
     max = markers[2] > markers[max] ? 2 : max;
     if (markers[max] > 3 && p->buf_size / markers[max] < 32*1024 &&
         markers[max] * 4 > sum * 3)
-        return AVPROBE_SCORE_MAX/2+1;
+        return AVPROBE_SCORE_EXTENSION + 1;
 
     return 0;
 }
@@ -73,5 +70,5 @@ AVInputFormat ff_dts_demuxer = {
     .read_packet    = ff_raw_read_partial_packet,
     .flags          = AVFMT_GENERIC_INDEX,
     .extensions     = "dts",
-    .raw_codec_id   = CODEC_ID_DTS,
+    .raw_codec_id   = AV_CODEC_ID_DTS,
 };