[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10779] trunk/blender/source/blender/imbuf /intern/util.c: * fix for #6714

Nathan Letwory jesterking at letwory.net
Fri May 25 19:11:24 CEST 2007


Revision: 10779
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bforge-svn&revision=10779
Author:   jesterking
Date:     2007-05-25 19:11:24 +0200 (Fri, 25 May 2007)

Log Message:
-----------
* fix for #6714
  - don't handle images with ffmpeg, blender knows itself perfectly fine how to do that. This fix is done as per Qt handling (skip non-Qt files).

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	2007-05-25 16:43:25 UTC (rev 10778)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2007-05-25 17:11:24 UTC (rev 10779)
@@ -242,6 +242,15 @@
 
 	do_init_ffmpeg();
 
+	if( BLI_testextensie(filename, ".swf") ||
+		BLI_testextensie(filename, ".jpg") ||
+		BLI_testextensie(filename, ".png") ||
+		BLI_testextensie(filename, ".tga") ||
+		BLI_testextensie(filename, ".bmp") ||
+		BLI_testextensie(filename, ".exr") ||
+		BLI_testextensie(filename, ".cin") ||
+		BLI_testextensie(filename, ".wav")) return 0;
+
 	if(av_open_input_file(&pFormatCtx, filename, NULL, 0, NULL)!=0) {
 		fprintf(stderr, "isffmpeg: av_open_input_file failed\n");
 		return 0;
@@ -266,8 +275,10 @@
 			break;
 		}
 
-	if(videoStream==-1)
+	if(videoStream==-1) {
+		av_close_input_file(pFormatCtx);
 		return 0;
+	}
 
 	pCodecCtx = get_codec_from_stream(pFormatCtx->streams[videoStream]);
 





More information about the Bf-blender-cvs mailing list