diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:34:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:34:49 +0100 |
| commit | 7630e564caaef008ae255c3b63ac725131073b6f (patch) | |
| tree | 28d00107374434d841637f6a299446d1e7122f72 /libavcodec/ptx.c | |
| parent | a897ba33e88316d2591a89ab93f8f69587d245ca (diff) | |
| parent | c755870d52c8c29676e5ba7ee9557adf4a7ca934 (diff) | |
| download | ffmpeg-7630e564caaef008ae255c3b63ac725131073b6f.tar.gz | |
Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'
* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
sgidec: stop using deprecated avcodec_set_dimensions
rv34: stop using deprecated avcodec_set_dimensions
rv10: stop using deprecated avcodec_set_dimensions
ptx: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/sgidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ptx.c')
| -rw-r--r-- | libavcodec/ptx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 6da9f0250c..8c3abd7ddb 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -55,10 +55,9 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, buf += offset; - 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; |