generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  mem: Document the non-compatibility of av_realloc() and av_malloc()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-15 11:56:56 +02:00
commit 61b3b58720
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavutil/mem.h
View File

@ -107,8 +107,12 @@ av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t siz
* reallocated. * reallocated.
* @return Pointer to a newly-reallocated block or NULL if the block * @return Pointer to a newly-reallocated block or NULL if the block
* cannot be reallocated or the function is used to free the memory block. * cannot be reallocated or the function is used to free the memory block.
* @note av_realloc() is not guaranteed to maintain the alignment of * @warning Pointers originating from the av_malloc() family of functions must
* pointers originating from the av_malloc() family of functions. * not be passed to av_realloc(). 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.
* @see av_fast_realloc() * @see av_fast_realloc()
*/ */
void *av_realloc(void *ptr, size_t size) av_alloc_size(2); void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
@ -133,8 +137,12 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
* @param size Size of the single element * @param size Size of the single element
* @return Pointer to a newly-reallocated block or NULL if the block * @return Pointer to a newly-reallocated block or NULL if the block
* cannot be reallocated or the function is used to free the memory block. * cannot be reallocated or the function is used to free the memory block.
* @note av_realloc_array() is not guaranteed to maintain the alignment of * @warning Pointers originating from the av_malloc() family of functions must
* pointers originating from the av_malloc() family of functions. * not be passed to av_realloc(). 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.
*/ */
av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size); av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
@ -148,8 +156,12 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
* @param nmemb Number of elements * @param nmemb Number of elements
* @param size Size of the single element * @param size Size of the single element
* @return Zero on success, an AVERROR error code on failure. * @return Zero on success, an AVERROR error code on failure.
* @note av_reallocp_array() is not guaranteed to maintain the alignment of * @warning Pointers originating from the av_malloc() family of functions must
* pointers originating from the av_malloc() family of functions. * not be passed to av_realloc(). 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.
*/ */
av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size); av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);