summaryrefslogtreecommitdiff
path: root/libavcodec/dnxhddata.c
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2015-10-05 20:44:45 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-10-07 23:33:44 +0200
commit79cfb36f92bd8f6dcd456d00584d270b19004af3 (patch)
treeca2789e1bb85cd9fb1f01e82d4c09f8fb42ab450 /libavcodec/dnxhddata.c
parent4e7fa057d2ff025f87b08e31558e5f7a785d2eb1 (diff)
downloadffmpeg-79cfb36f92bd8f6dcd456d00584d270b19004af3.tar.gz
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>
Diffstat (limited to 'libavcodec/dnxhddata.c')
-rw-r--r--libavcodec/dnxhddata.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index 241ce23a1c..ffc80183b5 100644
--- 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,