avcodec/ffv1enc: support forcing experimental 1.4 version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-09 00:39:02 +01:00
parent 7854d2d251
commit b07da13ac0

View File

@ -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);