[FFmpeg-cvslog] targa: stop using deprecated avcodec_set_dimensions

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Oct 27 10:02:26 2013 +0100| [eed5a478ba1bd41b01b1144959ac5f1889238b43] | committer: Anton Khirnov

targa: stop using deprecated avcodec_set_dimensions

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eed5a478ba1bd41b01b1144959ac5f1889238b43
---

 libavcodec/targa.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 9f0b286..f077c03 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;