rawdec: use av_image_check_size
authorPeter Ross <pross@xvid.org>
Sun, 25 Nov 2012 02:20:00 +0000 (13:20 +1100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Nov 2012 17:38:12 +0000 (18:38 +0100)
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rawdec.c

index 4d4bce9..f60f5e4 100644 (file)
@@ -175,10 +175,8 @@ static int raw_decode(AVCodecContext *avctx,
         frame->top_field_first  = context->tff;
     }
 
-    if (avctx->width <= 0 || avctx->height <= 0) {
-        av_log(avctx, AV_LOG_ERROR, "w/h is invalid\n");
-        return AVERROR(EINVAL);
-    }
+    if ((res = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
+        return res;
 
     //2bpp and 4bpp raw in avi and mov (yes this is ugly ...)
     if (context->buffer) {