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.

Andreas Rheinhardt committed 5 years ago

Commit 8d5de911 parent 1ea36504 files · +16 −7Browse files

Unified · Split

4 files

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

     return av_malloc(result);
 }
+#if FF_API_AV_MALLOCZ_ARRAY
 void *av_mallocz_array(size_t nmemb, size_t size)
 {
     size_t result;
         return NULL;
     return av_mallocz(result);
 }
+#endif
 void *av_realloc_array(void *ptr, 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().
+ * @deprecated use av_calloc()
- *
- * Created for symmetry with the calloc() C function.
  */
-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.

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

Keyboard shortcuts