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 /libavcodec/proresenc_anatoliy.c | |
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 'libavcodec/proresenc_anatoliy.c')
0 files changed, 0 insertions, 0 deletions