@@ -211,6 +211,7 @@ 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;
@@ -218,6 +219,7 @@ void *av_mallocz_array(size_t nmemb, size_t size)
return NULL;
return av_mallocz(result);
}
+#endif
void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
{
@@ -237,14 +237,15 @@ av_alloc_size(1, 2) void *av_malloc_array(size_t nmemb, size_t size);
* @see av_mallocz()
* @see av_malloc_array()
*/
-av_alloc_size(1, 2) void *av_mallocz_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
/**
- * Equivalent of av_mallocz_array().
- *
- * Created for symmetry with the calloc() C function.
+ * @deprecated use av_calloc()
*/
-void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
+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.
@@ -114,6 +114,9 @@
#ifndef FF_API_COLORSPACE_NAME
#define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58)
#endif
+#ifndef FF_API_AV_MALLOCZ_ARRAY
+#define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58)
+#endif
/**
* @}
It does the same as av_calloc(), so one of them should be removed. Given that av_calloc() has the shorter name, it is retained. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavutil/mem.c | 2 ++ libavutil/mem.h | 11 ++++++----- libavutil/version.h | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-)