MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavu/frame: Add error report if av_image_fill_pointers fail.

Browse Source 
Add error handle if av_image_fill_pointers fail.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Jun Zhao 2018-10-28 10:44:29 +08:00 committed by Jun Zhao
parent 903f2beafc
commit f3bcb9c16a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/frame.c
View File

@ -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)