diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-18 19:22:30 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-18 19:22:30 +0100 |
| commit | 53587ca48280626d007599e3e29c85d021b6997a (patch) | |
| tree | a65a79fb24ab00aefe0e8a1379bd9166e9ea1c74 | |
| parent | 824d4062a172bd435fea7cbf8d6b55583c73e70e (diff) | |
| parent | ec021d48445a414325ad59a73f9cde3212b173e4 (diff) | |
| download | ffmpeg-53587ca48280626d007599e3e29c85d021b6997a.tar.gz | |
Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'
* commit 'ec021d48445a414325ad59a73f9cde3212b173e4':
buffer: fix av_buffer_pool_init2() documentation
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavutil/buffer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/buffer.h b/libavutil/buffer.h index 0c0ce12cf2..73b6bd0b14 100644 --- a/libavutil/buffer.h +++ b/libavutil/buffer.h @@ -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 * pool is empty. * @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 - * by the pool and all the frames are returned to the pool and - * freed. It is intended to uninitialize the user opaque data. + * is freed. I.e. after av_buffer_pool_uninit() is called + * by the caller and all the frames are returned to the pool + * and freed. It is intended to uninitialize the user opaque + * data. * @return newly created buffer pool on success, NULL on error. */ AVBufferPool *av_buffer_pool_init2(int size, void *opaque, |