summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2015-10-05 20:44:46 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-10-08 00:22:06 +0200
commit5911eeb033c384ba0842f7e2e11d737f1d479dd9 (patch)
tree68dc2c5356d89fc83ecd8f0fe102dca13517a59a
parent79cfb36f92bd8f6dcd456d00584d270b19004af3 (diff)
dnxhdenc: mark CID 1260 encoder experimental
The MBAFF handling recently introduced on the decoder side shows that the encoder does not support it correctly. Therefore, make the related profile experimental. Furthermore, current encoder logic treats it as unable to encode as progressive, which isn't the case. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dnxhddata.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index ffc80183b5..87499c772f 100644
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -1158,6 +1158,11 @@ int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth)
if (cid->width == avctx->width && cid->height == avctx->height &&
interlaced == !!(avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) &&
!(cid->flags & DNXHD_444) && cid->bit_depth == bit_depth) {
+ if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL &&
+ cid->flags & DNXHD_MBAFF) {
+ av_log(avctx, AV_LOG_WARNING, "Profile selected is experimental\n");
+ continue;
+ }
for (j = 0; j < FF_ARRAY_ELEMS(cid->bit_rates); j++) {
if (cid->bit_rates[j] == mbs)
return cid->cid;