diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:43:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:43:29 +0100 |
| commit | ffd100b111f4d494a9d70dae0efef0307eaf84d8 (patch) | |
| tree | ea85fc5a2a9976982f18bd26b3d96ff352a402c6 /libavcodec/targa.c | |
| parent | 7630e564caaef008ae255c3b63ac725131073b6f (diff) | |
| parent | c265b8bb7638546919465e3585441b1d40c4b13d (diff) | |
| download | ffmpeg-ffd100b111f4d494a9d70dae0efef0307eaf84d8.tar.gz | |
Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'
* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
tiff: stop using deprecated avcodec_set_dimensions
targa: stop using deprecated avcodec_set_dimensions
svq1dec: stop using deprecated avcodec_set_dimensions
sunrast: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/sunrast.c
libavcodec/targa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/targa.c')
| -rw-r--r-- | libavcodec/targa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/targa.c b/libavcodec/targa.c index b3616c29d7..b0c9b55f33 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -173,10 +173,9 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - 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; p->pict_type = AV_PICTURE_TYPE_I; |