dnxhddata: introduce and use MBAFF flag

MBAFF-like handling of interlaced content in CID 1260 is different from
the other CIDs, and in particular doesn't use the same syntax.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index 241ce23..ffc8018 100644 (file)
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -1072,7 +1072,7 @@ const CIDEntry ff_dnxhd_cid_table[] = {
       dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run,
       { 63, 84, 100, 110 } },
     { 1260, 1440, 1080, 835584, 417792,
-      DNXHD_INTERLACED, 4, 8, 3,
+      DNXHD_INTERLACED | DNXHD_MBAFF, 4, 8, 3,
       dnxhd_1260_luma_weight, dnxhd_1260_chroma_weight,
       dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
       dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level,

diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index e960fc9..a1fcf06 100644 (file)
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -28,7 +28,8 @@
 
 /** Additional profile info flags */
 #define DNXHD_INTERLACED   (1<<0)
-#define DNXHD_444          (1<<1)
+#define DNXHD_MBAFF        (1<<1)
+#define DNXHD_444          (1<<2)
 
 /** Indicate that a CIDEntry value must be read in the bitstream */
 #define DNXHD_VARIABLE 0