diff options
author | Ton Roosendaal <ton@blender.org> | 2013-04-30 15:11:18 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-04-30 15:11:18 +0400 |
commit | 1ed6ab2f8c0bb42efa65233ab7dc6d0fb3fb77dc (patch) | |
tree | bd8122031ca3d7f565d759680fd9fbe519a561a3 /source/blender | |
parent | 3b04b861bd964a54ee88defe899978ae564cb037 (diff) |
Bug fix #35143
Animplayer treated .tif extensions as movie files, so that didn't work.
Added another hardcoded check for it, like for png tga exr jpg etc.
Why FFmpeg thinks .tif is a movie... that's for another day :)
Quicktime QTKit did same btw.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/imbuf/intern/util.c | 1 | ||||
-rw-r--r-- | source/blender/quicktime/apple/qtkit_import.m | 2 | ||||
-rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 849ba300fbf..fa1316f631f 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -297,6 +297,7 @@ static int isffmpeg(const char *filename) BLI_testextensie(filename, ".dds") || BLI_testextensie(filename, ".tga") || BLI_testextensie(filename, ".bmp") || + BLI_testextensie(filename, ".tif") || BLI_testextensie(filename, ".exr") || BLI_testextensie(filename, ".cin") || BLI_testextensie(filename, ".wav")) diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index e23fb29446a..c215b1dc7e2 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -94,6 +94,8 @@ int anim_is_quicktime(const char *name) BLI_testextensie(name, ".png") || BLI_testextensie(name, ".bmp") || BLI_testextensie(name, ".jpg") || + BLI_testextensie(name, ".tif") || + BLI_testextensie(name, ".exr") || BLI_testextensie(name, ".wav") || BLI_testextensie(name, ".zip") || BLI_testextensie(name, ".mp3")) diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index 9481a37e3c7..7fb14e5da09 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -200,6 +200,8 @@ int anim_is_quicktime(const char *name) BLI_testextensie(name, ".png") || BLI_testextensie(name, ".bmp") || BLI_testextensie(name, ".jpg") || + BLI_testextensie(name, ".tif") || + BLI_testextensie(name, ".exr") || BLI_testextensie(name, ".wav") || BLI_testextensie(name, ".zip") || BLI_testextensie(name, ".mp3")) |