From: Roberto Togni <r_togni@tiscali.it>
Date: Sat, 15 Jan 2005 00:07:38 +0000 (+0000)
Subject: Use avcodec_check_dimensions instead of custom hack
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3048af835051b4245e51e63204fce72e7c71c8a4;p=ffmpeg

Use avcodec_check_dimensions instead of custom hack

Originally committed as revision 3836 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 9adf4967c5c..5123532d2d9 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -160,8 +160,7 @@ static int decode_init(AVCodecContext *avctx)
 
 	c->pic.data[0] = NULL;
 
-    // FIXME: find a better way to prevent integer overflow
-    if (((unsigned int)avctx->width > 32000) || ((unsigned int)avctx->height > 32000)) {
+    if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
         av_log(avctx, AV_LOG_ERROR, "Bad image size (w = %d, h = %d).\n", avctx->width, avctx->height);
         return 1;
     }
diff --git a/libavcodec/lcl.c b/libavcodec/lcl.c
index cd2a3a84988..bf04154a91b 100644
--- a/libavcodec/lcl.c
+++ b/libavcodec/lcl.c
@@ -640,9 +640,7 @@ static int decode_init(AVCodecContext *avctx)
         return 1;
     }
 
-    // FIXME: find a better way to prevent integer overflow
-    if (((unsigned int)avctx->width > 32000) || ((unsigned int)avctx->height > 32000)) {
-        av_log(avctx, AV_LOG_ERROR, "Bad image size (w = %d, h = %d).\n", avctx->width, avctx->height);
+    if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
         return 1;
     }