[FFmpeg-cvslog] Merge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'
James Almer
git at videolan.org
Thu Sep 28 02:35:58 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Sep 27 20:35:04 2017 -0300| [1a115a31d430b71973b1e1556fcf767417449f09] | committer: James Almer
Merge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'
* commit 'ce6d72d10776b03c6780d4aa676414ce002285d4':
imgutils: Document av_image_get_buffer_size()
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a115a31d430b71973b1e1556fcf767417449f09
---
libavutil/imgutils.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h
index 2ab90ac033..5b790ecf0a 100644
--- a/libavutil/imgutils.h
+++ b/libavutil/imgutils.h
@@ -172,7 +172,11 @@ int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4],
* Return the size in bytes of the amount of data required to store an
* image with the given parameters.
*
- * @param[in] align the assumed linesize alignment
+ * @param pix_fmt the pixel format of the image
+ * @param width the width of the image in pixels
+ * @param height the height of the image in pixels
+ * @param align the assumed linesize alignment
+ * @return the buffer size in bytes, a negative error code in case of failure
*/
int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, int width, int height, int align);
======================================================================
More information about the ffmpeg-cvslog
mailing list