mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-02 06:23:23 +02:00
Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'
* commit '771656bd85416cd6308b11aed6f2c69a8db9c21b':
libvpxenc: clean memory on error
Conflicts:
libavcodec/libvpxenc.c
See: 104b1d9e10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8426edef4c
@ -644,7 +644,7 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out,
|
|||||||
av_log(avctx, AV_LOG_ERROR,
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
"Data buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
|
"Data buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
|
||||||
cx_frame->sz);
|
cx_frame->sz);
|
||||||
av_free(cx_frame);
|
av_freep(&cx_frame);
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
}
|
}
|
||||||
memcpy(cx_frame->buf, pkt->data.frame.buf, pkt->data.frame.sz);
|
memcpy(cx_frame->buf, pkt->data.frame.buf, pkt->data.frame.sz);
|
||||||
|
Loading…
Reference in New Issue
Block a user