[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14702] trunk/blender/source/blender/imbuf /intern/util.c: == FFMPEG ==

Peter Schlaile peter at schlaile.de
Tue May 6 00:08:50 CEST 2008


Revision: 14702
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14702
Author:   schlaile
Date:     2008-05-06 00:08:50 +0200 (Tue, 06 May 2008)

Log Message:
-----------
== FFMPEG ==

Fixes: [#10703] loading an .avi captured by dosbox causes a segfault
We shouldn't try to close a codec, if we haven't managed to open one... :)

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

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2008-05-05 21:33:06 UTC (rev 14701)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2008-05-05 22:08:50 UTC (rev 14702)
@@ -305,13 +305,11 @@
         /* Find the decoder for the video stream */
 	pCodec=avcodec_find_decoder(pCodecCtx->codec_id);
 	if(pCodec==NULL) {
-		avcodec_close(pCodecCtx);
 		av_close_input_file(pFormatCtx);
 		return 0;
 	}
 
 	if(avcodec_open(pCodecCtx, pCodec)<0) {
-		avcodec_close(pCodecCtx);
 		av_close_input_file(pFormatCtx);
 		return 0;
 	}





More information about the Bf-blender-cvs mailing list