diff mbox

[FFmpeg-devel,2/2] lavu/frame: Add error report if av_image_fill_pointers fail.

Message ID 1540695947-26873-3-git-send-email-mypopydev@gmail.com
State Accepted
Commit f3bcb9c16a427934a681558a24202bd118e0aa06
Headers show

Commit Message

Jun Zhao Oct. 28, 2018, 3:05 a.m. UTC 
Add error handle if av_image_fill_pointers fail.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
---
 libavutil/frame.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

Comments

Michael Niedermayer Oct. 29, 2018, 3:20 p.m. UTC | #1 
On Sun, Oct 28, 2018 at 11:05:47AM +0800, Jun Zhao wrote:
> Add error handle if av_image_fill_pointers fail.
> 
> Signed-off-by: Jun Zhao <mypopydev@gmail.com>
> ---
>  libavutil/frame.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)

should be ok

[...]
mypopy@gmail.com Oct. 30, 2018, 12:22 a.m. UTC | #2 
On Mon, Oct 29, 2018 at 11:20 PM Michael Niedermayer
<michael@niedermayer.cc> wrote:
>
> On Sun, Oct 28, 2018 at 11:05:47AM +0800, Jun Zhao wrote:
> > Add error handle if av_image_fill_pointers fail.
> >
> > Signed-off-by: Jun Zhao <mypopydev@gmail.com>
> > ---
> >  libavutil/frame.c |   10 ++++++----
> >  1 files changed, 6 insertions(+), 4 deletions(-)
>
> should be ok
>
Will apply, Tks.
diff mbox

Patch

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)