diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-06 09:36:45 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-06 09:36:45 +0000 |
| commit | bf176f58b79e9bbbcc0eb243d39fda3f2419992c (patch) | |
| tree | bc160c982bebab7a533b4deababe8e3c8648e54a /libavcore | |
| parent | 85fbad4555448c27e9b40b44663f5bd1dde452d2 (diff) | |
Deprecate avcodec_check_dimensions() in favor of the new function
av_check_image_size() declared in libavcore/imgutils.h.
Originally committed as revision 24709 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcore')
| -rw-r--r-- | libavcore/avcore.h | 2 | ||||
| -rw-r--r-- | libavcore/imgutils.c | 19 | ||||
| -rw-r--r-- | libavcore/imgutils.h | 12 |
3 files changed, 32 insertions, 1 deletions
diff --git a/libavcore/avcore.h b/libavcore/avcore.h index 5ddb6167aa..cba074ec54 100644 --- a/libavcore/avcore.h +++ b/libavcore/avcore.h @@ -27,7 +27,7 @@ #include <libavutil/avutil.h> #define LIBAVCORE_VERSION_MAJOR 0 -#define LIBAVCORE_VERSION_MINOR 2 +#define LIBAVCORE_VERSION_MINOR 3 #define LIBAVCORE_VERSION_MICRO 0 #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ diff --git a/libavcore/imgutils.c b/libavcore/imgutils.c index 54c10d2d45..350caed3c1 100644 --- a/libavcore/imgutils.c +++ b/libavcore/imgutils.c @@ -95,3 +95,22 @@ int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int heigh return total_size; } + +typedef struct ImgUtils { + const AVClass *class; + int log_offset; + void *log_ctx; +} ImgUtils; + +static const AVClass imgutils_class = { "IMGUTILS", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(ImgUtils, log_offset), offsetof(ImgUtils, log_ctx) }; + +int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx) +{ + ImgUtils imgutils = { &imgutils_class, log_offset, log_ctx }; + + if((int)w>0 && (int)h>0 && (w+128)*(uint64_t)(h+128) < INT_MAX/8) + return 0; + + av_log(&imgutils, AV_LOG_ERROR, "picture size invalid (%ux%u)\n", w, h); + return AVERROR(EINVAL); +} diff --git a/libavcore/imgutils.h b/libavcore/imgutils.h index 4a4d6a1521..be6886c38e 100644 --- a/libavcore/imgutils.h +++ b/libavcore/imgutils.h @@ -50,4 +50,16 @@ int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int widt int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height, uint8_t *ptr, const int linesizes[4]); +/** + * Check if the given dimension of an image is valid, meaning that all + * bytes of the image can be addressed with a signed int. + * + * @param w the width of the picture + * @param h the height of the picture + * @param log_offset the offset to sum to the log level for logging with log_ctx + * @param log_ctx the parent logging context, it may be NULL + * @return >= 0 if valid, a negative error code otherwise + */ +int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx); + #endif /* AVCORE_IMGUTILS_H */ |