1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-19 02:41:38 +02:00

Merge commit 'c7384664ba0cbb12d882effafbc6d321ae706cff'

* commit 'c7384664ba0cbb12d882effafbc6d321ae706cff':
  avs: check ff_set_dimensions return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-13 14:50:35 +01:00
commit 04f6a5230d

View File

@ -165,9 +165,8 @@ static av_cold int avs_decode_init(AVCodecContext * avctx)
return AVERROR(ENOMEM);
avctx->pix_fmt = AV_PIX_FMT_PAL8;
ff_set_dimensions(avctx, 318, 198);
return 0;
return ff_set_dimensions(avctx, 318, 198);
}
static av_cold int avs_decode_end(AVCodecContext *avctx)