Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'

* commit 'ec021d48445a414325ad59a73f9cde3212b173e4':
  buffer: fix av_buffer_pool_init2() documentation

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-18 19:22:30 +01:00
commit 53587ca482

View File

@ -256,9 +256,10 @@ AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
* @param alloc a function that will be used to allocate new buffers when the * @param alloc a function that will be used to allocate new buffers when the
* pool is empty. * pool is empty.
* @param pool_free a function that will be called immediately before the pool * @param pool_free a function that will be called immediately before the pool
* is freed. I.e. after av_buffer_pool_can_uninit() is called * is freed. I.e. after av_buffer_pool_uninit() is called
* by the pool and all the frames are returned to the pool and * by the caller and all the frames are returned to the pool
* freed. It is intended to uninitialize the user opaque data. * and freed. It is intended to uninitialize the user opaque
* data.
* @return newly created buffer pool on success, NULL on error. * @return newly created buffer pool on success, NULL on error.
*/ */
AVBufferPool *av_buffer_pool_init2(int size, void *opaque, AVBufferPool *av_buffer_pool_init2(int size, void *opaque,