aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-10-27 10:02:26 +0100
committerAnton Khirnov <anton@khirnov.net>2013-10-31 20:14:16 +0100
commiteed5a478ba1bd41b01b1144959ac5f1889238b43 (patch)
treefdf3dec15752a3dc64c23a09e7c17fb17428ed8e
parent7fbb75cc701af9bfcaac21afecdb22e5e5efd528 (diff)
downloadffmpeg-eed5a478ba1bd41b01b1144959ac5f1889238b43.tar.gz
targa: stop using deprecated avcodec_set_dimensions
-rw-r--r--libavcodec/targa.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 9f0b286813..f077c03d65 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -142,10 +142,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){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;