diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-11-18 12:49:42 +0300 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-11-18 12:49:42 +0300 |
| commit | 624cd67d5571c7e6597151d124416a17a2095d3a (patch) | |
| tree | e612a036a1390128b4640e86b015f8003bff100c /source/blender/imbuf/intern/util.c | |
| parent | 22e8616a270f3d78467bf136a98f13b2551e020a (diff) | |
Quicktime for Cocoa : import part
This makes quicktime import (.mov & quicktime handled image files such as .gif) available also for 64bit OSX
Unfortunately, Apple currently incomplete implementation of QTKit has much lower performance than old Carbon Quicktime.
FYI, it spawns a 32bit process "QTKitserver" to place calls to Quicktime 7.
So this is mostly meant as a "backup" for 64bit OSX builds, until Apple releases full Quicktime X.
Export part will come just after.
CMake scripts updated: set WITH_QUICKTIME and USE_QTKIT to ON
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 26434583118..5bcdd6c9670 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -384,6 +384,9 @@ int imb_get_anim_type(char * name) { if(UTIL_DEBUG) printf("in getanimtype: %s\n", name); #ifndef _WIN32 +# ifdef WITH_QUICKTIME + if (isqtime(name)) return (ANIM_QTIME); +# endif # ifdef WITH_FFMPEG /* stat test below fails on large files > 4GB */ if (isffmpeg(name)) return (ANIM_FFMPEG); @@ -394,9 +397,6 @@ int imb_get_anim_type(char * name) { if (isavi(name)) return (ANIM_AVI); if (ismovie(name)) return (ANIM_MOVIE); -# ifdef WITH_QUICKTIME - if (isqtime(name)) return (ANIM_QTIME); -# endif #else if (ib_stat(name,&st) == -1) return(0); if (((st.st_mode) & S_IFMT) != S_IFREG) return(0); |