avcodec/ffv1enc: support forcing experimental 1.4 version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · b07da13ac0
parent 7854d2d251
commit b07da13ac0
1 changed files with 3 additions and 1 deletions
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@ -674,9 +674,11 @@ 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 || (avctx->level <= 0 && s->version == 2)) {
+    if (avctx->level <= 0 && s->version == 2) {
        s->version = 3;
    }
+    if (avctx->level >= 0 && avctx->level <= 4)
+        s->version = FFMAX(s->version, avctx->level);

    if (s->ec < 0) {
        s->ec = (s->version >= 3);