[FFmpeg-cvslog] ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX

Stefano Sabatini git at videolan.org
Tue Jun 21 03:45:20 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Thu Apr 21 10:31:48 2011 +0200| [5a0a6ae639ac791ddebce64e2c316186d1db575c] | committer: Anton Khirnov

ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX

Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a0a6ae639ac791ddebce64e2c316186d1db575c
---

 libavfilter/vf_libopencv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
index 509b1d9..5a52f24 100644
--- a/libavfilter/vf_libopencv.c
+++ b/libavfilter/vf_libopencv.c
@@ -158,7 +158,7 @@ static int read_shape_from_file(int *cols, int *rows, int **values, const char *
         }
         w++;
     }
-    if (*rows > (FF_INTERNAL_MEM_TYPE_MAX_VALUE / (sizeof(int)) / *cols)) {
+    if (*rows > (SIZE_MAX / sizeof(int) / *cols)) {
         av_log(log_ctx, AV_LOG_ERROR, "File with size %dx%d is too big\n",
                *rows, *cols);
         return AVERROR_INVALIDDATA;



More information about the ffmpeg-cvslog mailing list