Merge commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13'

[ffmpeg] / libavcodec / brender_pix.c

diff --git a/libavcodec/brender_pix.c b/libavcodec/brender_pix.c
index e1f5d48944049ce799794256c767a9b10993258d..23a46cc0edc5f384f9ee4ea3316b3cf4311aa1cd 100644 (file)
--- a/libavcodec/brender_pix.c
+++ b/libavcodec/brender_pix.c
@@ -128,11 +128,8 @@ static int brpix_decode_frame(AVCodecContext *avctx,
         return AVERROR_PATCHWELCOME;
     }
 
-    if (av_image_check_size(hdr.width, hdr.height, 0, avctx) < 0)
-        return AVERROR_INVALIDDATA;
-
-    if (hdr.width != avctx->width || hdr.height != avctx->height)
-        avcodec_set_dimensions(avctx, hdr.width, hdr.height);
+    if ((ret = ff_set_dimensions(avctx, hdr.width, hdr.height)) < 0)
+        return ret;
 
     if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
         return ret;