1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-07 00:20:09 +02:00

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>
This commit is contained in:
Christophe Gisquet 2015-10-05 20:44:45 +02:00 committed by Michael Niedermayer
parent 4e7fa057d2
commit 79cfb36f92
2 changed files with 3 additions and 2 deletions

View File

@ -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,

View File

@ -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