diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-04-24 20:35:16 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-04-24 20:35:16 +0400 |
| commit | 5b4e62a977ba1cbe0f2b66a28c5a228da3b9faa6 (patch) | |
| tree | dbf282ecadd80c101196afe66a6c35dd7c399f85 /source/creator | |
| parent | 87d30fdd247a205ccb76cee1f7cf6547df46a606 (diff) | |
Fix for #22135, loading ffmpeg now before .B25.blend is loaded.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/creator.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index 68b99b20d01..436275e8c6b 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1001,6 +1001,10 @@ int main(int argc, char **argv) /* background render uses this font too */ BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size); + + /* Initialiaze ffmpeg if built in, also needed for bg mode if videos are + rendered via ffmpeg */ + sound_init_once(); init_def_material(); @@ -1015,11 +1019,13 @@ int main(int argc, char **argv) #ifndef DISABLE_SDL BLI_setenv("SDL_VIDEODRIVER", "dummy"); +/* I think this is not necessary anymore (04-24-2010 neXyon) #ifdef __linux__ - /* On linux the default SDL driver dma often would not play - * use alsa if none is set */ + // On linux the default SDL driver dma often would not play + // use alsa if none is set setenv("SDL_AUDIODRIVER", "alsa", 0); #endif +*/ #endif } else { |