diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2015-10-03 18:59:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-05 12:58:40 +0200 |
| commit | 66db504f038afa02aaecb94a81f549e431211a47 (patch) | |
| tree | dd704a3a673760e59e1f180893abfe053d3d656d /libavcodec/dnxhddec.c | |
| parent | 118a3cd2c5e210ef7c8c36a083a6c3a68d5fb395 (diff) | |
| download | ffmpeg-66db504f038afa02aaecb94a81f549e431211a47.tar.gz | |
dnxhd: add CID 1270
This a 4:4:4 10 bits profile, where image size is not fixed by the
profile, and which strays a bit outside the old frame header parsing
code.
Fixes ticket #4581 (DNxHR is not stricly supported, but that sequence is).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/dnxhddec.c')
| -rw-r--r-- | libavcodec/dnxhddec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 47f1535f09..147143963c 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -224,7 +224,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, "Adaptive MB interlace flag in an unsupported profile.\n"); ctx->act = buf[0x2C] & 7; - if (ctx->act && ctx->cid_table->cid != 1256) + if (ctx->act && ctx->cid_table->cid != 1256 && ctx->cid_table->cid != 1270) av_log(ctx->avctx, AV_LOG_WARNING, "Adaptive color transform in an unsupported profile.\n"); |