diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:25:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:25:09 +0100 |
| commit | a897ba33e88316d2591a89ab93f8f69587d245ca (patch) | |
| tree | 0286276ca6dd54107f8f9db82e8277a59d3f1955 /libavcodec/pictordec.c | |
| parent | 64a0ed190efa4c8d1514a7d258ab533b340408d8 (diff) | |
| parent | 0f21d8b1b40848973558c737aebe800c46e93a3d (diff) | |
Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'
* commit '0f21d8b1b40848973558c737aebe800c46e93a3d':
pictordec: stop using deprecated avcodec_set_dimensions
pgssubdec: stop using deprecated avcodec_set_dimensions
pcx: stop using deprecated avcodec_set_dimensions
mpegvideo_parser: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/pcx.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pictordec.c')
| -rw-r--r-- | libavcodec/pictordec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 5b528f5e8a..1bc51bcf24 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -143,7 +143,9 @@ static int decode_frame(AVCodecContext *avctx, if (av_image_check_size(s->width, s->height, 0, avctx) < 0) return -1; if (s->width != avctx->width && s->height != avctx->height) { - avcodec_set_dimensions(avctx, s->width, s->height); + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; } if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) |