virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/pthread_frame: Fix memleak with frame threads and allocated AVOptions

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-04-06 18:18:41 +02:00
parent f79cd98caf
commit 7ddbb4e23a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/pthread_frame.c
View File

@@ -48,6 +48,7 @@
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/opt.h"
/** /**
* Context used by codec threads and stored in their AVCodecInternal thread_ctx. * Context used by codec threads and stored in their AVCodecInternal thread_ctx.
@@ -574,8 +575,6 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
if (codec->close) if (codec->close)
codec->close(p->avctx); codec->close(p->avctx);
avctx->codec = NULL;
release_delayed_buffers(p); release_delayed_buffers(p);
av_frame_free(&p->frame); av_frame_free(&p->frame);
} }
@@ -603,6 +602,10 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
av_freep(&fctx->threads); av_freep(&fctx->threads);
pthread_mutex_destroy(&fctx->buffer_mutex); pthread_mutex_destroy(&fctx->buffer_mutex);
av_freep(&avctx->internal->thread_ctx); av_freep(&avctx->internal->thread_ctx);
if (avctx->priv_data && avctx->codec && avctx->codec->priv_class)
av_opt_free(avctx->priv_data);
avctx->codec = NULL;
} }
int ff_frame_thread_init(AVCodecContext *avctx) int ff_frame_thread_init(AVCodecContext *avctx)