diff options
| author | Peter Ross <pross@xvid.org> | 2012-11-25 13:20:00 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-25 18:38:12 +0100 |
| commit | 2d954ccd84e6a3dd030325ef94afec67309b2eba (patch) | |
| tree | 719f43c935973bbeb6f74a6da911dcef3df528fa | |
| parent | 252746d052652b48f7bc0652e7c1601b1e997d9c (diff) | |
| download | ffmpeg-2d954ccd84e6a3dd030325ef94afec67309b2eba.tar.gz | |
rawdec: use av_image_check_size
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/rawdec.c | 6 |
1 files 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) { |