Skip to content
Browse files

lavc: return s->get_buffer() error code if it errors out

Signed-off-by: Paul B Mahol <onemda@gmail.com>
  • Loading branch information...
1 parent f58f902 commit 93931143feb05f745a960dcc9e2e69e50de3e890 @richardpl richardpl committed
Showing with 3 additions and 3 deletions.
  1. +3 −3 libavcodec/utils.c
View
6 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);

0 comments on commit 9393114

Please sign in to comment.
Something went wrong with that request. Please try again.