diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt index 3ab40eab2..7b7c1f0aa 100644 --- a/src/osgDB/CMakeLists.txt +++ b/src/osgDB/CMakeLists.txt @@ -60,6 +60,10 @@ IF(APPLE) ADD_DEFINITIONS(-DDARWIN_QUICKTIME) ENDIF(APPLE) +IF(QUICKTIME_FOUND) + ADD_DEFINITIONS(-DUSE_QUICKTIME) +ENDIF(QUICKTIME_FOUND) + IF(XINE_FOUND) ADD_DEFINITIONS(-DUSE_XINE) ENDIF(XINE_FOUND) diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index 9ef2647a4..ae49c6926 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -209,8 +209,10 @@ Registry::Registry() addFileExtensionAlias("flv", "qt"); addFileExtensionAlias("mpv", "qt"); addFileExtensionAlias("dv", "qt"); - addFileExtensionAlias("mp4", "qt"); - addFileExtensionAlias("m4v", "qt"); + addFileExtensionAlias("mp4", "qt"); + addFileExtensionAlias("m4v", "qt"); + // Add QuickTime live support for OSX + addFileExtensionAlias("live", "qt"); #else addFileExtensionAlias("jpg", "jpeg"); addFileExtensionAlias("jpe", "jpeg"); @@ -227,9 +229,13 @@ Registry::Registry() addFileExtensionAlias("flv", "xine"); #endif + // support QuickTime for Windows + #if defined(USE_QUICKTIME) + addFileExtensionAlias("mov", "qt"); + addFileExtensionAlias("live", "qt"); + #endif #endif - // remove geo to lwo alias as the new Carbon Graphics GEO format // also uses the .geo. It is still possible to load light wave .geo // files via loading the lwo plugin explicitly and then doing a readNodeFile.