diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2014-10-22 13:59:54 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-10-22 14:00:07 +0400 |
commit | 74f40a5217c9c72447a80881c192de72577e869c (patch) | |
tree | fe7c2b76edb20e816126245e14bcb7e1a8ca3ac4 /source/blender/quicktime | |
parent | 86dbc9dd9a0f6426de5431ddab22a9a9da945e63 (diff) |
OSX: fix T42325 by not letting .vob handled by qt, avoids a doublefree
Diffstat (limited to 'source/blender/quicktime')
-rw-r--r-- | source/blender/quicktime/apple/qtkit_import.m | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 9318c896d7c..d42d0ee8ebb 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -88,6 +88,7 @@ int anim_is_quicktime(const char *name) ".swf", ".txt", ".mpg", + ".vob", /* disabled, vob is essential .mpg, don't handle */ ".avi", /* wouldn't be appropriate ;) */ ".mov", /* disabled, suboptimal decoding speed */ ".mp4", /* disabled, suboptimal decoding speed */ |