diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-29 04:53:29 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-29 04:53:29 +0400 |
commit | 141dd5233ede83a6d3882713c95bba47cee90a68 (patch) | |
tree | 23cdf3e596bba784d101f9e32f234b399ffba4b1 /source/creator | |
parent | 22b30da565de53a0a1d34079d72b08fdb54ec8e3 (diff) | |
parent | 8321acaf439b33cca0b054565be176047d289134 (diff) |
Merged changes in the trunk up to revision 50257.
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index be9e8cee9d0..e0e82679645 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1276,6 +1276,10 @@ int main(int argc, const char **argv) IMB_init(); +#ifdef WITH_FFMPEG + IMB_ffmpeg_init(); +#endif + BLI_callback_global_init(); #ifdef WITH_GAMEENGINE |