From 93931143feb05f745a960dcc9e2e69e50de3e890 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 13 Oct 2012 08:12:50 +0000 Subject: [PATCH] lavc: return s->get_buffer() error code if it errors out Signed-off-by: Paul B Mahol --- libavcodec/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 183776a09c..ae748b5f37 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -621,7 +621,7 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic) { AVFrame temp_pic; - int i; + int i, ret; av_assert0(s->codec_type == AVMEDIA_TYPE_VIDEO); @@ -655,8 +655,8 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic) pic->data[i] = pic->base[i] = NULL; pic->opaque = NULL; /* Allocate new frame */ - if (s->get_buffer(s, pic)) - return -1; + if ((ret = s->get_buffer(s, pic))) + return ret; /* Copy image data from old buffer to new buffer */ av_picture_copy((AVPicture *)pic, (AVPicture *)&temp_pic, s->pix_fmt, s->width, s->height);