diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-27 23:29:20 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-27 23:31:53 -0300 |
| commit | 7aa6b8a68fce93d84c359158f198cd55324d0025 (patch) | |
| tree | 667ebb2f9bccc2b2703c5a10df990a017e917a5d /libavutil/frame.h | |
| parent | 24ee1b8c6343f00a3f5cd5d5aee5850f22436204 (diff) | |
| parent | 4de220d2e3751c459f8739a08ac6ca52e63eba30 (diff) | |
Merge commit '4de220d2e3751c459f8739a08ac6ca52e63eba30'
* commit '4de220d2e3751c459f8739a08ac6ca52e63eba30':
frame: allow align=0 (meaning automatic) for av_frame_get_buffer()
See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/frame.h')
| -rw-r--r-- | libavutil/frame.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 013043c250..b8591a442b 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -681,7 +681,9 @@ void av_frame_move_ref(AVFrame *dst, AVFrame *src); * cases. * * @param frame frame in which to store the new buffers. - * @param align required buffer size alignment + * @param align Required buffer size alignment. If equal to 0, alignment will be + * chosen automatically for the current CPU. It is highly + * recommended to pass 0 here unless you know what you are doing. * * @return 0 on success, a negative AVERROR on error. */ |