diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:08:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:08:20 +0100 |
| commit | 8426edef4cf521104bb9288ac46a48dc4bdaee53 (patch) | |
| tree | 51a07cc48e411611ac25cd7e79f4850042a3cba5 | |
| parent | 7384ec19cf13fe204317c1b88333c58cbfa6336a (diff) | |
| parent | 771656bd85416cd6308b11aed6f2c69a8db9c21b (diff) | |
| download | ffmpeg-8426edef4cf521104bb9288ac46a48dc4bdaee53.tar.gz | |
Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'
* commit '771656bd85416cd6308b11aed6f2c69a8db9c21b':
libvpxenc: clean memory on error
Conflicts:
libavcodec/libvpxenc.c
See: 104b1d9e103f90485e894b20dd5bb3f1964fe5f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libvpxenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 30940a128d..c69acc00ef 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -644,7 +644,7 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out, av_log(avctx, AV_LOG_ERROR, "Data buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n", cx_frame->sz); - av_free(cx_frame); + av_freep(&cx_frame); return AVERROR(ENOMEM); } memcpy(cx_frame->buf, pkt->data.frame.buf, pkt->data.frame.sz); |