diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 22:21:59 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-11-14 09:42:22 +0100 |
commit | cce3e0a49f0dd030262c28d9c53de0bd2fd909c4 (patch) | |
tree | 8976499166d5a5d4425ed647d139e4c5c4604ccf /libavcodec/avcodec.h | |
parent | aa241229891173b0357eee04e6ca78f806cc9c0c (diff) | |
download | ffmpeg-cce3e0a49f0dd030262c28d9c53de0bd2fd909c4.tar.gz |
Move av_fast_{m,re}alloc from lavc to lavu.
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 294783bda6..79c6efc3a2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -36,6 +36,10 @@ #include "libavutil/dict.h" #include "libavutil/frame.h" #include "libavutil/log.h" +#if FF_API_FAST_MALLOC +// to provide fast_*alloc +#include "libavutil/mem.h" +#endif #include "libavutil/pixfmt.h" #include "libavutil/rational.h" @@ -4198,27 +4202,6 @@ AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f); /* memory */ /** - * 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); - -/** * Allocate a buffer with padding, reusing the given one if large enough. * * Same behaviour av_fast_malloc but the buffer has additional |