diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-27 21:43:55 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 00:48:13 +0400 |
commit | 7f138310fbef540fe30ee7cbcf0ee5f5de2456ef (patch) | |
tree | 66a793741e261a24eaca0cc399693e6d4fe5ea2a /libavcodec/ffv1enc.c | |
parent | 1c1a2d1319422f7d4386b171f1c7309b66bde268 (diff) |
ffv1enc: favor version 3 over 2 unless -strict -2 is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1enc.c')
-rw-r--r-- | libavcodec/ffv1enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index d897dc4128..7b4c08e570 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -647,7 +647,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((avctx->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)) || avctx->slices>1) s->version = FFMAX(s->version, 2); - if (avctx->level == 3) { + if (avctx->level == 3 || (s->version==2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL)) { s->version = 3; } |