[Bf-blender-cvs] [dc9f906] master: FFmpeg: Solve memory leak happening on encoding video

Sergey Sharybin noreply at git.blender.org
Tue Sep 22 18:31:27 CEST 2015


Commit: dc9f906d4238d577b4e4e37be0cfbf4c98704ba1
Author: Sergey Sharybin
Date:   Tue Sep 22 21:09:39 2015 +0500
Branches: master
https://developer.blender.org/rBdc9f906d4238d577b4e4e37be0cfbf4c98704ba1

FFmpeg: Solve memory leak happening on encoding video

===================================================================

M	source/blender/blenkernel/intern/writeffmpeg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index edda852..bc734a9 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -1234,15 +1234,6 @@ static void end_ffmpeg_impl(FFMpegContext *context, int is_autosplit)
 		context->video_stream = 0;
 	}
 
-	
-	/* Close the output file */
-	if (context->outfile) {
-		for (i = 0; i < context->outfile->nb_streams; i++) {
-			if (&context->outfile->streams[i]) {
-				av_freep(&context->outfile->streams[i]);
-			}
-		}
-	}
 	/* free the temp buffer */
 	if (context->current_frame) {
 		delete_picture(context->current_frame);
@@ -1254,7 +1245,7 @@ static void end_ffmpeg_impl(FFMpegContext *context, int is_autosplit)
 		}
 	}
 	if (context->outfile) {
-		av_free(context->outfile);
+		avformat_free_context(context->outfile);
 		context->outfile = 0;
 	}
 	if (context->audio_input_buffer) {




More information about the Bf-blender-cvs mailing list