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

James Almer committed 6 years ago

Commit ec39c221 parent 7f817853 files · +7 −1Browse files

Unified · Split

3 files

@@ -15,6 +15,9 @@ libavutil: 2017-10-21 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2020-06-xx - xxxxxxxxxx - lavu 56.50.100 - buffer.h
		19	Passing NULL as alloc argument to av_buffer_pool_init2() is now allowed.
		20
18	2020-xx-xx - xxxxxxxxxx - lavc 58.88.100 - avcodec.h codec.h	21	2020-xx-xx - xxxxxxxxxx - lavc 58.88.100 - avcodec.h codec.h
19	Move AVCodec-related public API to new header codec.h.	22	Move AVCodec-related public API to new header codec.h.
20		23

     pool->size      = size;
     pool->opaque    = opaque;
     pool->alloc2    = alloc;
+    pool->alloc     = av_buffer_alloc; // fallback
     pool->pool_free = pool_free;
     atomic_init(&pool->refcount, 1);
     BufferPoolEntry *buf;
     AVBufferRef     *ret;
+    av_assert0(pool->alloc || pool->alloc2);
     ret = pool->alloc2 ? pool->alloc2(pool->opaque, pool->size) :
                          pool->alloc(pool->size);
     if (!ret)

@@ -79,7 +79,7 @@ · 78 unmodified lines
79	*/	79	*/
80		80
81	#define LIBAVUTIL_VERSION_MAJOR 56	81	#define LIBAVUTIL_VERSION_MAJOR 56
82	#define LIBAVUTIL_VERSION_MINOR 49	82	#define LIBAVUTIL_VERSION_MINOR 50
83	#define LIBAVUTIL_VERSION_MICRO 100	83	#define LIBAVUTIL_VERSION_MICRO 100
84		84
85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Keyboard shortcuts