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

avcodec/frame_thread_encoder: fix memory leak that occurs when close encoder without sending eof and receiving to end 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
lee ju 2018-08-04 10:19:45 +00:00 committed by Michael Niedermayer
parent 3378194ce8
commit 6a0feafebe
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/frame_thread_encoder.c
View File

@ -251,6 +251,23 @@ void ff_frame_thread_encoder_free(AVCodecContext *avctx){
pthread_join(c->worker[i], NULL); pthread_join(c->worker[i], NULL);
} }
while (av_fifo_size(c->task_fifo) > 0) {
Task task;
AVFrame *frame;
av_fifo_generic_read(c->task_fifo, &task, sizeof(task), NULL);
frame = task.indata;
av_frame_free(&frame);
task.indata = NULL;
}
for (i=0; i<BUFFER_SIZE; i++) {
if (c->finished_tasks[i].outdata != NULL) {
AVPacket *pkt = c->finished_tasks[i].outdata;
av_packet_free(&pkt);
c->finished_tasks[i].outdata = NULL;
}
}
pthread_mutex_destroy(&c->task_fifo_mutex); pthread_mutex_destroy(&c->task_fifo_mutex);
pthread_mutex_destroy(&c->finished_task_mutex); pthread_mutex_destroy(&c->finished_task_mutex);
pthread_mutex_destroy(&c->buffer_mutex); pthread_mutex_destroy(&c->buffer_mutex);