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-05-21 16:18:35 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-05-21 16:18:35 +0400
commit8360c14f14868663de898df1ea47839768d4afd6 (patch)
treed3d2d4bc6069df91e0dcfa50635afb91949e2d51 /source/creator
parentc4ee1f265847db4fed34df05a32f4b0fa3612092 (diff)
Fix #35443: Animation player doesn't play some movie formats
Need to initialize FFmpeg for animation player. This is a bit confusing, but the only way to do this properly and clear is to call IMB_ffmpeg_init from playback_mode command line callback. This is because this callback is blocking and "usual" FFmpeg initializetion (which happens after command line parsing) was never called. Could be switched to separate FFmpeg initializtion and debug level set but let's keep simple for now.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/creator.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 418c05e22ce..34bf541a720 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -634,6 +634,11 @@ static int playback_mode(int argc, const char **argv, void *UNUSED(data))
{
/* not if -b was given first */
if (G.background == 0) {
+#ifdef WITH_FFMPEG
+ /* Setup FFmpeg with current debug flags. */
+ IMB_ffmpeg_init();
+#endif
+
WM_main_playanim(argc, argv); /* not the same argc and argv as before */
exit(0); /* 2.4x didn't do this */
}