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

frame_thread_encode: fix context memleak 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-28 17:04:11 +01:00
parent 991db63951
commit f472d01c25
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/frame_thread_encoder.c
View File

@ -152,16 +152,14 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
for(i=0; i<avctx->thread_count ; i++){ for(i=0; i<avctx->thread_count ; i++){
AVDictionary *tmp = NULL; AVDictionary *tmp = NULL;
void *tmpv;
AVCodecContext *thread_avctx = avcodec_alloc_context3(avctx->codec); AVCodecContext *thread_avctx = avcodec_alloc_context3(avctx->codec);
if(!thread_avctx) if(!thread_avctx)
goto fail; goto fail;
tmpv = thread_avctx->priv_data;
*thread_avctx = *avctx; *thread_avctx = *avctx;
thread_avctx->priv_data = tmpv;
thread_avctx->internal = NULL; thread_avctx->internal = NULL;
thread_avctx->priv_data = av_malloc(avctx->codec->priv_data_size);
if(!thread_avctx->priv_data) {
av_freep(&thread_avctx);
goto fail;
}
memcpy(thread_avctx->priv_data, avctx->priv_data, avctx->codec->priv_data_size); memcpy(thread_avctx->priv_data, avctx->priv_data, avctx->codec->priv_data_size);
thread_avctx->thread_count = 1; thread_avctx->thread_count = 1;
thread_avctx->active_thread_type &= ~FF_THREAD_FRAME; thread_avctx->active_thread_type &= ~FF_THREAD_FRAME;