diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 18:04:04 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 18:04:04 +0400 |
commit | 7c888ae746da0d9f6a11bab9758c01d641b49d7b (patch) | |
tree | 22862c9f615cb2e636feec9ffd1d5e2a675295ed /libavutil/mem.h | |
parent | 2925571278bf09702564dfedd5e7731a112dd1f0 (diff) | |
parent | cce3e0a49f0dd030262c28d9c53de0bd2fd909c4 (diff) |
Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'
* commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4':
Move av_fast_{m,re}alloc from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/mem.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/mem.h')
-rw-r--r-- | libavutil/mem.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h index 77b7adc373..703ce81936 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -336,6 +336,27 @@ void av_max_alloc(size_t max); void av_memcpy_backptr(uint8_t *dst, int back, int cnt); /** + * Reallocate the given block if it is not large enough, otherwise do nothing. + * + * @see av_realloc + */ +void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size); + +/** + * Allocate a buffer, reusing the given one if large enough. + * + * Contrary to av_fast_realloc the current buffer contents might not be + * preserved and on error the old buffer is freed, thus no special + * handling to avoid memleaks is necessary. + * + * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer + * @param size size of the buffer *ptr points to + * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and + * *size 0 if an error occurred. + */ +void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size); + +/** * @} */ |