diff options
| author | James Almer <jamrial@gmail.com> | 2023-01-11 10:50:01 -0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-02-09 15:35:14 +0100 |
| commit | dc1b8135e096e4a41c1d606f8ca5795053136ad7 (patch) | |
| tree | 68ef61623785b4a68a099e20b6fd6ed52bf7a6f3 /libavutil | |
| parent | 16c4e8f9c106c1e4f4e50a06b7ed0350928775b8 (diff) | |
| download | ffmpeg-dc1b8135e096e4a41c1d606f8ca5795053136ad7.tar.gz | |
avutil: remove FF_API_AV_MALLOCZ_ARRAY
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/mem.c | 10 | ||||
| -rw-r--r-- | libavutil/mem.h | 8 | ||||
| -rw-r--r-- | libavutil/version.h | 1 |
3 files changed, 0 insertions, 19 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c index 18aff5291f..36b8940a0c 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -212,16 +212,6 @@ void *av_malloc_array(size_t nmemb, size_t size) return av_malloc(result); } -#if FF_API_AV_MALLOCZ_ARRAY -void *av_mallocz_array(size_t nmemb, size_t size) -{ - size_t result; - if (size_mult(nmemb, size, &result) < 0) - return NULL; - return av_mallocz(result); -} -#endif - void *av_realloc_array(void *ptr, size_t nmemb, size_t size) { size_t result; diff --git a/libavutil/mem.h b/libavutil/mem.h index b093b3b5cb..62b4ca6e50 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -159,14 +159,6 @@ av_alloc_size(1, 2) void *av_malloc_array(size_t nmemb, size_t size); */ void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2); -#if FF_API_AV_MALLOCZ_ARRAY -/** - * @deprecated use av_calloc() - */ -attribute_deprecated -void *av_mallocz_array(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2); -#endif - /** * Allocate, reallocate, or free a block of memory. * diff --git a/libavutil/version.h b/libavutil/version.h index a635d6d7a3..40dc9f241f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 58) |