virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'

Browse Source 
* 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:
Michael Niedermayer 2014-11-18 03:08:20 +01:00
commit 8426edef4c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libvpxenc.c
View File

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