Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-04-29 20:03:21 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-04-29 20:03:21 +0400
commit685e9b83c22aa3b2dc44bf34c82dbf751b407ab0 (patch)
tree281032f77046d9d1358ba1fd631af283f2a0d2fb
parentb13ef55973cfbd60d95069f4830d4777cc99a448 (diff)
Fix for --debug-ffmpeg not giving enough information
-rw-r--r--source/blender/imbuf/intern/util.c3
-rw-r--r--source/creator/creator.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 68d1c906a1f..849ba300fbf 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -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);
}
diff --git a/source/creator/creator.c b/source/creator/creator.c
index b7d6a96ab04..5c6f85c918d 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -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();