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 | |
| parent | 24ee1b8c6343f00a3f5cd5d5aee5850f22436204 (diff) | |
| parent | 4de220d2e3751c459f8739a08ac6ca52e63eba30 (diff) | |
| download | ffmpeg-7aa6b8a68fce93d84c359158f198cd55324d0025.tar.gz | |
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>
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavutil/frame.c | 3 | ||||
| -rw-r--r-- | libavutil/frame.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 4838ec3728..606ba7f6c0 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2015-08-28 API changes, most recent first: +2017-09-27 - xxxxxxx - lavu 55.77.101 / lavu 55.31.1 - frame.h + Allow passing the value of 0 (meaning "automatic") as the required alignment + to av_frame_get_buffer(). + 2017-09-27 - xxxxxxx - lavu 55.77.100 / lavu 55.31.0 - cpu.h Add av_cpu_max_align() for querying maximum required data alignment. 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)); 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. */ diff --git a/libavutil/version.h b/libavutil/version.h index 9dbcdc4a8c..dee4f5b4c5 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -81,7 +81,7 @@ #define LIBAVUTIL_VERSION_MAJOR 55 #define LIBAVUTIL_VERSION_MINOR 77 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |