aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-09 00:39:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-09 00:39:02 +0100
commitb07da13ac0f04b9c77efc0b9840e23cc4cd9aa33 (patch)
tree5ceaeb7572c82707b01ca9c752f8e478ee430407
parent7854d2d2515dc2a54c5f309100aeecf83cd14e97 (diff)
downloadffmpeg-b07da13ac0f04b9c77efc0b9840e23cc4cd9aa33.tar.gz
avcodec/ffv1enc: support forcing experimental 1.4 version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/ffv1enc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 4e2e0b3da9..25a69bf8e0 100644
--- 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);