Browse Source

Merge commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616' into release/2.4

* commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616':
  avs: check ff_set_dimensions return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.7
Michael Niedermayer 11 years ago
parent
commit
98ba288737
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavcodec/avs.c

+ 1
- 2
libavcodec/avs.c 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)


Loading…
Cancel
Save