removed native quicktime init/exit calls from main blender code.

3 files changed, 38 insertions, 36 deletions

diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 0e77fe2b73d..777c56972ea 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -521,7 +521,13 @@ void IMB_rectfill(unsigned int *drect, unsigned int *srect, int x, int value);
  *
  * @attention Defined in quicktime_import.c
  */
-void init_quicktime(void);
+void quicktime_init(void);
+
+/**
+ *
+ * @attention Defined in quicktime_import.c
+ */
+void quicktime_exit(void);
 
 #endif //WITH_QUICKTIME
 
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c
index eeaa8c4189e..72a571570cf 100644
--- a/source/blender/quicktime/apple/quicktime_import.c
+++ b/source/blender/quicktime/apple/quicktime_import.c
@@ -59,28 +59,45 @@
 #define QTIME_DEBUG 0
 
 
-void init_quicktime(void)
+void quicktime_init(void)
 {
 #ifdef _WIN32
-        if (InitializeQTML(0) != noErr)
-            G.have_quicktime = FALSE;
-        else
-            G.have_quicktime = TRUE;
+	if (InitializeQTML(0) != noErr)
+		G.have_quicktime = FALSE;
+	else
+		G.have_quicktime = TRUE;
 #endif /* _WIN32 */
 
-        /* Initialize QuickTime */
+	/* Initialize QuickTime */
 #if defined(_WIN32) || defined (__APPLE__)
-        if (EnterMovies() != noErr)
-            G.have_quicktime = FALSE;
-        else
+	if (EnterMovies() != noErr)
+		G.have_quicktime = FALSE;
+	else
 #endif /* _WIN32 || __APPLE__ */
 #ifdef __linux__
-			/* inititalize quicktime codec registry */
-			lqt_registry_init();
+	/* inititalize quicktime codec registry */
+		lqt_registry_init();
 #endif
-			G.have_quicktime = TRUE;
+	G.have_quicktime = TRUE;
 }
 
+
+void quicktime_exit(void)
+{
+#if defined(_WIN32) || defined(__APPLE__)
+#ifdef WITH_QUICKTIME
+	if(G.have_quicktime) {
+		free_qtcodecdataExt();
+		ExitMovies();
+#ifdef _WIN32
+		TerminateQTML();
+#endif /* _WIN32 */
+	}
+#endif /* WITH_QUICKTIME */
+#endif /* _WIN32 || __APPLE__ */
+}
+
+
 int anim_is_quicktime (char *name)
 {
 	FSSpec	theFSSpec;
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index b79d98cfdb4..55ab8b4e40a 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -118,17 +118,6 @@
 
 #include "PIL_time.h"
 
-#ifdef WITH_QUICKTIME
-#include "quicktime_export.h"
-#ifdef _WIN32
-#include <QTML.h>
-#include <Movies.h>
-#elif defined (__APPLE__)
-#undef NDEBUG
-#include <QuickTime/Movies.h>
-#endif /* __APPLE__ */
-#endif /* WITH_QUICKTIME */
-
 /***/
 
 void BIF_read_file(char *name)
@@ -556,19 +545,9 @@ void exit_usiblender(void)
 	free_txt_data();
 
 	sound_exit_audio();
-		
-#if defined(_WIN32) || defined(__APPLE__)
-#ifdef WITH_QUICKTIME
-    if(G.have_quicktime) {
-		free_qtcodecdataExt();
-        ExitMovies();
-#ifdef _WIN32
-        TerminateQTML();
-#endif /* _WIN32 */
-    }
-#endif /* WITH_QUICKTIME */
-#endif /* _WIN32 || __APPLE__ */
 
+	quicktime_exit();
+		
 	BPY_end_python();
 
 	if (!G.background) {