[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56387] trunk/blender/source: Fix for --debug-ffmpeg not giving enough information

Sergey Sharybin sergey.vfx at gmail.com
Mon Apr 29 18:03:22 CEST 2013


Revision: 56387
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56387
Author:   nazgul
Date:     2013-04-29 16:03:21 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
Fix for --debug-ffmpeg not giving enough information

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

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2013-04-29 15:52:38 UTC (rev 56386)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2013-04-29 16:03:21 UTC (rev 56387)
@@ -271,6 +271,9 @@
 
 	ffmpeg_last_error[0] = '\0';
 
+	if (G.debug & G_DEBUG_FFMPEG)
+		av_log_set_level(AV_LOG_DEBUG);
+
 	/* set own callback which could store last error to report to UI */
 	av_log_set_callback(ffmpeg_log_callback);
 }

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2013-04-29 15:52:38 UTC (rev 56386)
+++ trunk/blender/source/creator/creator.c	2013-04-29 16:03:21 UTC (rev 56387)
@@ -1500,10 +1500,6 @@
 
 	BKE_brush_system_init();
 
-#ifdef WITH_FFMPEG
-	IMB_ffmpeg_init();
-#endif
-
 	BLI_callback_global_init();
 
 #ifdef WITH_GAMEENGINE
@@ -1528,6 +1524,10 @@
 	(void)syshandle;
 #endif
 
+#ifdef WITH_FFMPEG
+	IMB_ffmpeg_init();
+#endif
+
 	/* after level 1 args, this is so playanim skips RNA init */
 	RNA_init();
 




More information about the Bf-blender-cvs mailing list