generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2012-10-13 08:12:50 +00:00
parent f58f90238f
commit 93931143fe
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/utils.c
View File

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