OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
702a62a
)
ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX
author
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Thu, 21 Apr 2011 08:31:48 +0000
(10:31 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Mon, 20 Jun 2011 18:54:40 +0000
(20:54 +0200)
Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavfilter/vf_libopencv.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_libopencv.c
b/libavfilter/vf_libopencv.c
index
509b1d9
..
5a52f24
100644
(file)
--- 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;