MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avutil/mem: Deprecate av_mallocz_array() 

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.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-14 23:32:37 +02:00
parent 1ea3650823
commit 8d5de914d3
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -14,6 +14,9 @@ libavutil: 2021-04-27
API changes, most recent first:
2021-09-20 - xxxxxxxxxx - lavu 57.6.100 - mem.h
Deprecate av_mallocz_array() as it is identical to av_calloc().
2021-09-20 - xxxxxxxxxx - lavc 59.9.100 - avcodec.h
Deprecate AVCodecContext.sub_text_format and the corresponding
AVOptions. It is unused since the last major bump.

2
libavutil/mem.c
View File

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

11
libavutil/mem.h
View File

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

7
libavutil/version.h
View File

@ -79,8 +79,8 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 57
#define LIBAVUTIL_VERSION_MINOR 5
#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_MINOR 6
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
@ -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
/**
* @}