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/pcx.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/pcx.c')
| -rw-r--r-- | libavcodec/pcx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index 66b1a35fdf..6487aa573b 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -132,10 +132,9 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, bytestream2_skipu(&gb, 60); - if ((ret = av_image_check_size(w, h, 0, avctx)) < 0) + if ((ret = ff_set_dimensions(avctx, w, h)) < 0) return ret; - if (w != avctx->width || h != avctx->height) - avcodec_set_dimensions(avctx, w, h); + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) return ret; |