avutil: remove FF_API_AV_MALLOCZ_ARRAY

Signed-off-by: James Almer <jamrial@gmail.com>
release/6.0
James Almer 2 years ago committed by Anton Khirnov
parent 16c4e8f9c1
commit dc1b8135e0
  1. 10
      libavutil/mem.c
  2. 8
      libavutil/mem.h
  3. 1
      libavutil/version.h

@ -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;

@ -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.
*

@ -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)

Loading…
Cancel
Save