RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/svq1enc: fix error handling/cleanup in case of ff_get_buffer() or scratchbuffer alloc failure 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-18 21:25:06 +01:00
parent 2a3af77284
commit 79888388e7
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/svq1enc.c
View File

@ -590,14 +590,20 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
if (!s->current_picture->data[0]) {
if ((ret = ff_get_buffer(avctx, s->current_picture, 0))< 0 ||
(ret = ff_get_buffer(avctx, s->last_picture, 0)) < 0) {
if ((ret = ff_get_buffer(avctx, s->current_picture, 0)) < 0) {
return ret;
}
s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 3);
}
if (!s->scratchbuf)
return AVERROR(ENOMEM);
if (!s->last_picture->data[0]) {
if ((ret = ff_get_buffer(avctx, s->last_picture, 0)) < 0) {
return ret;
}
}
if (!s->scratchbuf) {
s->scratchbuf = av_malloc_array(s->current_picture->linesize[0], 16 * 3);
if (!s->scratchbuf)
return AVERROR(ENOMEM);
}
FFSWAP(AVFrame*, s->current_picture, s->last_picture);