MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/ffv1enc: Fix error message when the requested version does not support the requested features

Browse Source 
Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-09-15 20:27:14 +02:00
parent 0f711126b8
commit 72db5e96fc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/ffv1enc.c
View File

@ -683,8 +683,13 @@ static av_cold int encode_init(AVCodecContext *avctx)
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 (avctx->level >= 0 && avctx->level <= 4) {
if (avctx->level < s->version) {
av_log(avctx, AV_LOG_ERROR, "Version %d needed for requested features but %d requested\n", s->version, avctx->level);
return AVERROR(EINVAL);
}
s->version = avctx->level;
}
if (s->ec < 0) {
s->ec = (s->version >= 3);