From f472d01c25a875d46a2b178c7817a9e44ab57ebd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 28 Oct 2012 17:04:11 +0100 Subject: frame_thread_encode: fix context memleak Signed-off-by: Michael Niedermayer --- libavcodec/frame_thread_encoder.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libavcodec/frame_thread_encoder.c') diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 550d145892..664526a303 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -152,16 +152,14 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ for(i=0; ithread_count ; i++){ AVDictionary *tmp = NULL; + void *tmpv; AVCodecContext *thread_avctx = avcodec_alloc_context3(avctx->codec); if(!thread_avctx) goto fail; + tmpv = thread_avctx->priv_data; *thread_avctx = *avctx; + thread_avctx->priv_data = tmpv; 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); thread_avctx->thread_count = 1; thread_avctx->active_thread_type &= ~FF_THREAD_FRAME; -- cgit v1.2.3