Fix for --debug-ffmpeg not giving enough information
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 29 Apr 2013 16:03:21 +0000 (16:03 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 29 Apr 2013 16:03:21 +0000 (16:03 +0000)
source/blender/imbuf/intern/util.c
source/creator/creator.c

index 68d1c906a1faba246c2c1c78f048cc770c9b47b0..849ba300fbfbc5cd74f0e89bca44c56ed338f937 100644 (file)
@@ -271,6 +271,9 @@ void IMB_ffmpeg_init(void)
 
        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);
 }
index b7d6a96ab0482a8c142ab1472405283cc5563e9c..5c6f85c918df028f5b96d4119879a837564facdf 100644 (file)
@@ -1500,10 +1500,6 @@ int main(int argc, const char **argv)
 
        BKE_brush_system_init();
 
-#ifdef WITH_FFMPEG
-       IMB_ffmpeg_init();
-#endif
-
        BLI_callback_global_init();
 
 #ifdef WITH_GAMEENGINE
@@ -1528,6 +1524,10 @@ int main(int argc, const char **argv)
        (void)syshandle;
 #endif
 
+#ifdef WITH_FFMPEG
+       IMB_ffmpeg_init();
+#endif
+
        /* after level 1 args, this is so playanim skips RNA init */
        RNA_init();