From 2d954ccd84e6a3dd030325ef94afec67309b2eba Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Sun, 25 Nov 2012 13:20:00 +1100 Subject: [PATCH] rawdec: use av_image_check_size Signed-off-by: Peter Ross Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavcodec/rawdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 4d4bce91f2..f60f5e4465 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -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) {