Commit acfb4ede authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6f7a3283'

* commit '6f7a3283':
  svq1enc: correctly handle memory error and allocations

Conflicts:
	libavcodec/svq1enc.c

See: 79888388Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 94337f8c 6f7a3283
......@@ -595,10 +595,10 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
}
if (!s->last_picture->data[0]) {
if ((ret = ff_get_buffer(avctx, s->last_picture, 0)) < 0) {
ret = ff_get_buffer(avctx, s->last_picture, 0);
if (ret < 0)
return ret;
}
}
if (!s->scratchbuf) {
s->scratchbuf = av_malloc_array(s->current_picture->linesize[0], 16 * 3);
if (!s->scratchbuf)
......
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