[FFmpeg-devel] [PATCH 2/2] lavu/frame: Add error report if av_image_fill_pointers fail.
Jun Zhao
mypopydev at gmail.com
Sun Oct 28 05:05:47 EET 2018
Add error handle if av_image_fill_pointers fail.
Signed-off-by: Jun Zhao <mypopydev at gmail.com>
---
libavutil/frame.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/libavutil/frame.c b/libavutil/frame.c
index 92626dc..9b3fb13 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -243,11 +243,13 @@ static int get_video_buffer(AVFrame *frame, int align)
return ret;
frame->buf[0] = av_buffer_alloc(ret + 4*plane_padding);
- if (!frame->buf[0])
+ if (!frame->buf[0]) {
+ ret = AVERROR(ENOMEM);
goto fail;
+ }
- if (av_image_fill_pointers(frame->data, frame->format, padded_height,
- frame->buf[0]->data, frame->linesize) < 0)
+ if ((ret = av_image_fill_pointers(frame->data, frame->format, padded_height,
+ frame->buf[0]->data, frame->linesize)) < 0)
goto fail;
for (i = 1; i < 4; i++) {
@@ -260,7 +262,7 @@ static int get_video_buffer(AVFrame *frame, int align)
return 0;
fail:
av_frame_unref(frame);
- return AVERROR(ENOMEM);
+ return ret;
}
static int get_audio_buffer(AVFrame *frame, int align)
--
1.7.1
More information about the ffmpeg-devel
mailing list