diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:55:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:55:58 +0100 |
commit | 8b2dd04afc779a2bdb8676c652154130e29438fb (patch) | |
tree | d1a2d99e1cbf25838c9aa1c9cde38feeef5b5d9f /libavcodec/webp.c | |
parent | 98ca3fb9cf7fdfad38e731ffb029fa3f96b94581 (diff) | |
parent | 0a9e94bba8f8a40156438a43e4fe0e9ae36236cb (diff) | |
download | ffmpeg-8b2dd04afc779a2bdb8676c652154130e29438fb.tar.gz |
Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'
* commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb':
webp: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/webp.c')
-rw-r--r-- | libavcodec/webp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 213e1cef16..a19ab485ee 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1085,10 +1085,10 @@ static int vp8_lossless_decode_frame(AVCodecContext *avctx, AVFrame *p, s->width, w); } s->height = h; - ret = av_image_check_size(s->width, s->height, 0, avctx); + + ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0) return ret; - avcodec_set_dimensions(avctx, s->width, s->height); s->has_alpha = get_bits1(&s->gb); |