diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:33:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:33:30 +0200 |
| commit | 67731ef40f9f86ca870ae4c5dbbe01ead8dba962 (patch) | |
| tree | 3e9a27bf178e0dc354322a74ac09485ca8ca4721 /libavutil | |
| parent | a5ba4e186bcb44c60f215e1367e3d5269b564cea (diff) | |
| parent | af8a47905a3fa349a68841fac76b461b305c5efe (diff) | |
| download | ffmpeg-67731ef40f9f86ca870ae4c5dbbe01ead8dba962.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: doxy: Small clarification for av_buffer_create()
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
Conflicts:
libavutil/buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/buffer.h b/libavutil/buffer.h index bcd1130826..b4399fd39f 100644 --- a/libavutil/buffer.h +++ b/libavutil/buffer.h @@ -121,7 +121,7 @@ AVBufferRef *av_buffer_allocz(int size); * If this function fails, data is left untouched. * @param data data array * @param size size of data in bytes - * @param free a callback for freeing data + * @param free a callback for freeing this buffer's data * @param opaque parameter to be got for processing or passed to free * @param flags a combination of AV_BUFFER_FLAG_* * |