[Bf-blender-cvs] [74f40a5] master: OSX: fix T42325 by not letting .vob handled by qt, avoids a doublefree
Jens Verwiebe
noreply at git.blender.org
Wed Oct 22 12:00:15 CEST 2014
Commit: 74f40a5217c9c72447a80881c192de72577e869c
Author: Jens Verwiebe
Date: Wed Oct 22 11:59:54 2014 +0200
Branches: master
https://developer.blender.org/rB74f40a5217c9c72447a80881c192de72577e869c
OSX: fix T42325 by not letting .vob handled by qt, avoids a doublefree
===================================================================
M source/blender/quicktime/apple/qtkit_import.m
===================================================================
diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m
index 9318c89..d42d0ee 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 */
More information about the Bf-blender-cvs
mailing list