[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60749] trunk/blender/source/blender/imbuf /intern/indexer.c: Fix #37043: bpy.ops.sequencer.rebuild_proxy() don' t release memory

[Sergey Sharybin]

Revision: 60749
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60749
Author:   nazgul
Date:     2013-10-14 15:56:48 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
Fix #37043: bpy.ops.sequencer.rebuild_proxy() don't release memory

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/indexer.c

Modified: trunk/blender/source/blender/imbuf/intern/indexer.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/indexer.c 2013-10-14 15:37:16 UTC 
(rev 60748)
+++ trunk/blender/source/blender/imbuf/intern/indexer.c 2013-10-14 15:56:48 UTC 
(rev 60749)
@@ -656,7 +656,6 @@
 static void free_proxy_output_ffmpeg(struct proxy_output_ctx *ctx,
                                      int rollback)
 {
-       int i;
        char fname[FILE_MAX];
        char fname_tmp[FILE_MAX];
 
@@ -674,18 +673,12 @@
        
        avcodec_close(ctx->c);
        
-       for (i = 0; i < ctx->of->nb_streams; i++) {
-               if (&ctx->of->streams[i]) {
-                       av_freep(&ctx->of->streams[i]);
-               }
-       }
-
        if (ctx->of->oformat) {
                if (!(ctx->of->oformat->flags & AVFMT_NOFILE)) {
                        avio_close(ctx->of->pb);
                }
        }
-       av_free(ctx->of);
+       avformat_free_context(ctx->of);
 
        MEM_freeN(ctx->video_buffer);
 
@@ -854,6 +847,9 @@
                }
        }
 
+       avcodec_close(context->iCodecCtx);
+       avformat_close_input(&context->iFormatCtx);
+
        MEM_freeN(context);
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs