Commit ec39c227 authored by James Almer's avatar James Almer

avutil/buffer: use the default allocator if none is provided to av_buffer_pool_init2()

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 7f817853
...@@ -15,6 +15,9 @@ libavutil: 2017-10-21 ...@@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first: API changes, most recent first:
2020-06-xx - xxxxxxxxxx - lavu 56.50.100 - buffer.h
Passing NULL as alloc argument to av_buffer_pool_init2() is now allowed.
2020-xx-xx - xxxxxxxxxx - lavc 58.88.100 - avcodec.h codec.h 2020-xx-xx - xxxxxxxxxx - lavc 58.88.100 - avcodec.h codec.h
Move AVCodec-related public API to new header codec.h. Move AVCodec-related public API to new header codec.h.
......
...@@ -229,6 +229,7 @@ AVBufferPool *av_buffer_pool_init2(int size, void *opaque, ...@@ -229,6 +229,7 @@ AVBufferPool *av_buffer_pool_init2(int size, void *opaque,
pool->size = size; pool->size = size;
pool->opaque = opaque; pool->opaque = opaque;
pool->alloc2 = alloc; pool->alloc2 = alloc;
pool->alloc = av_buffer_alloc; // fallback
pool->pool_free = pool_free; pool->pool_free = pool_free;
atomic_init(&pool->refcount, 1); atomic_init(&pool->refcount, 1);
...@@ -310,6 +311,8 @@ static AVBufferRef *pool_alloc_buffer(AVBufferPool *pool) ...@@ -310,6 +311,8 @@ static AVBufferRef *pool_alloc_buffer(AVBufferPool *pool)
BufferPoolEntry *buf; BufferPoolEntry *buf;
AVBufferRef *ret; AVBufferRef *ret;
av_assert0(pool->alloc || pool->alloc2);
ret = pool->alloc2 ? pool->alloc2(pool->opaque, pool->size) : ret = pool->alloc2 ? pool->alloc2(pool->opaque, pool->size) :
pool->alloc(pool->size); pool->alloc(pool->size);
if (!ret) if (!ret)
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 56 #define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 49 #define LIBAVUTIL_VERSION_MINOR 50
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment