diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-28 05:29:20 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-28 05:31:53 +0300 |
| commit | 7aa6b8a68fce93d84c359158f198cd55324d0025 (patch) | |
| tree | 667ebb2f9bccc2b2703c5a10df990a017e917a5d /libavutil/frame.c | |
| 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.c')
| -rw-r--r-- | libavutil/frame.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 85d89b9ed5..d5fd2932e3 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -181,6 +181,9 @@ static int get_video_buffer(AVFrame *frame, int align) return ret; if (!frame->linesize[0]) { + if (align <= 0) + align = 32; /* STRIDE_ALIGN. Should be av_cpu_max_align() */ + for(i=1; i<=align; i+=i) { ret = av_image_fill_linesizes(frame->linesize, frame->format, FFALIGN(frame->width, i)); |