diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:14:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:14:52 +0100 |
| commit | 64a0ed190efa4c8d1514a7d258ab533b340408d8 (patch) | |
| tree | 9574586d8083d3a2184b221c3a15d697020f8844 /libavcodec/libvpxdec.c | |
| parent | bf92cd8178e0553a27971118e2b2b9e87e7b810b (diff) | |
| parent | 13207484bba8a8b78b40d5a22da8c9c555429089 (diff) | |
Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'
* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
mpeg4video_parser: stop using deprecated avcodec_set_dimensions
mpeg12dec: stop using deprecated avcodec_set_dimensions
mjpegdec: stop using deprecated avcodec_set_dimensions
libvpxdec: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4video_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvpxdec.c')
| -rw-r--r-- | libavcodec/libvpxdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index de32f402b1..897a68bdad 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -90,9 +90,9 @@ static int vp8_decode(AVCodecContext *avctx, if ((int) img->d_w != avctx->width || (int) img->d_h != avctx->height) { av_log(avctx, AV_LOG_INFO, "dimension change! %dx%d -> %dx%d\n", avctx->width, avctx->height, img->d_w, img->d_h); - if (av_image_check_size(img->d_w, img->d_h, 0, avctx)) - return AVERROR_INVALIDDATA; - avcodec_set_dimensions(avctx, img->d_w, img->d_h); + ret = ff_set_dimensions(avctx, img->d_w, img->d_h); + if (ret < 0) + return ret; } if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) return ret; |