diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2015-10-05 20:44:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-07 23:33:44 +0200 |
| commit | 79cfb36f92bd8f6dcd456d00584d270b19004af3 (patch) | |
| tree | ca2789e1bb85cd9fb1f01e82d4c09f8fb42ab450 | |
| parent | 4e7fa057d2ff025f87b08e31558e5f7a785d2eb1 (diff) | |
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>
| -rw-r--r-- | libavcodec/dnxhddata.c | 2 | ||||
| -rw-r--r-- | libavcodec/dnxhddata.h | 3 |
2 files changed, 3 insertions, 2 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, diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index e960fc9775..a1fcf06798 100644 --- 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 |