diff mbox series

[FFmpeg-devel,22/26] avutil: remove FF_API_AV_MALLOCZ_ARRAY

Message ID 20230116133840.512-23-jamrial@gmail.com
State New
Headers show
Series Major library version bump | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished

Commit Message

James Almer Jan. 16, 2023, 1:38 p.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavutil/mem.c     | 10 ----------
 libavutil/mem.h     |  8 --------
 libavutil/version.h |  1 -
 3 files changed, 19 deletions(-)
diff mbox series

Patch

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 700af5d874..3bad472227 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)