mirror of https://git.ffmpeg.org/ffmpeg.git
mem: Introduce av_reallocp
This commit is contained in:
parent
187105ff8a
commit
3feb3d6ce4
|
@ -13,6 +13,9 @@ libavutil: 2012-10-22
|
|||
|
||||
API changes, most recent first:
|
||||
|
||||
2013-09-xx - xxxxxxx - lavu 52.13.0 - mem.h
|
||||
Add av_reallocp.
|
||||
|
||||
2013-08-xx - xxxxxxx - lavc 55.16.0 - avcodec.h
|
||||
Extend AVPacket API with av_packet_unref, av_packet_ref,
|
||||
av_packet_move_ref, av_packet_copy_props, av_packet_free_side_data.
|
||||
|
|
|
@ -136,6 +136,22 @@ void *av_realloc(void *ptr, size_t size)
|
|||
#endif
|
||||
}
|
||||
|
||||
int av_reallocp(void *ptr, size_t size)
|
||||
{
|
||||
void **ptrptr = ptr;
|
||||
void *ret;
|
||||
|
||||
ret = av_realloc(*ptrptr, size);
|
||||
|
||||
if (!ret) {
|
||||
av_freep(ptr);
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
|
||||
*ptrptr = ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
|
||||
{
|
||||
if (!size || nmemb >= INT_MAX / size)
|
||||
|
|
|
@ -116,6 +116,25 @@ av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t siz
|
|||
*/
|
||||
void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
|
||||
|
||||
/**
|
||||
* Allocate or reallocate a block of memory.
|
||||
* If *ptr is NULL and size > 0, allocate a new block. If
|
||||
* size is zero, free the memory block pointed to by ptr.
|
||||
* @param ptr Pointer to a pointer to a memory block already allocated
|
||||
* with av_realloc(), or pointer to a pointer to NULL.
|
||||
* The pointer is updated on success, or freed on failure.
|
||||
* @param size Size in bytes for the memory block to be allocated or
|
||||
* reallocated
|
||||
* @return Zero on success, an AVERROR error code on failure.
|
||||
* @warning Pointers originating from the av_malloc() family of functions must
|
||||
* not be passed to av_reallocp(). The former can be implemented using
|
||||
* memalign() (or other functions), and there is no guarantee that
|
||||
* pointers from such functions can be passed to realloc() at all.
|
||||
* The situation is undefined according to POSIX and may crash with
|
||||
* some libc implementations.
|
||||
*/
|
||||
int av_reallocp(void *ptr, size_t size);
|
||||
|
||||
/**
|
||||
* Allocate or reallocate an array.
|
||||
* If ptr is NULL and nmemb > 0, allocate a new block. If
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
*/
|
||||
|
||||
#define LIBAVUTIL_VERSION_MAJOR 52
|
||||
#define LIBAVUTIL_VERSION_MINOR 14
|
||||
#define LIBAVUTIL_VERSION_MINOR 15
|
||||
#define LIBAVUTIL_VERSION_MICRO 0
|
||||
|
||||
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
|
||||
|
|
Loading…
Reference in New Issue