Commit 93931143 authored by Paul B Mahol's avatar Paul B Mahol

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

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent f58f9023
...@@ -621,7 +621,7 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) ...@@ -621,7 +621,7 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)
int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic) int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic)
{ {
AVFrame temp_pic; AVFrame temp_pic;
int i; int i, ret;
av_assert0(s->codec_type == AVMEDIA_TYPE_VIDEO); av_assert0(s->codec_type == AVMEDIA_TYPE_VIDEO);
...@@ -655,8 +655,8 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic) ...@@ -655,8 +655,8 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic)
pic->data[i] = pic->base[i] = NULL; pic->data[i] = pic->base[i] = NULL;
pic->opaque = NULL; pic->opaque = NULL;
/* Allocate new frame */ /* Allocate new frame */
if (s->get_buffer(s, pic)) if ((ret = s->get_buffer(s, pic)))
return -1; return ret;
/* Copy image data from old buffer to new buffer */ /* Copy image data from old buffer to new buffer */
av_picture_copy((AVPicture *)pic, (AVPicture *)&temp_pic, s->pix_fmt, s->width, av_picture_copy((AVPicture *)pic, (AVPicture *)&temp_pic, s->pix_fmt, s->width,
s->height); s->height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment