diff libmpcodecs/vd_qtvideo.c @ 26216:e402c7730fcf

Introduce HAVE_QUICKTIME definition and use it where appropriate.
author diego
date Sat, 15 Mar 2008 11:31:28 +0000
parents afa125da85cf
children 3a2e8ae7c548
line wrap: on
line diff
--- a/libmpcodecs/vd_qtvideo.c	Sat Mar 15 10:04:19 2008 +0000
+++ b/libmpcodecs/vd_qtvideo.c	Sat Mar 15 11:31:28 2008 +0000
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#ifdef MACOSX
+#ifdef HAVE_QUICKTIME
 #include <QuickTime/ImageCodec.h>
 #define dump_ImageDescription(x)
 #endif
@@ -30,7 +30,7 @@
 
 #include "bswap.h"
 
-#ifndef MACOSX
+#ifndef HAVE_QUICKTIME
 #include "loader/qtx/qtxsdk/components.h"
 
 HMODULE   WINAPI LoadLibraryA(LPCSTR);
@@ -53,7 +53,7 @@
 static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
 static HMODULE handler;
 
-#if !defined(MACOSX)
+#ifndef HAVE_QUICKTIME
 static    Component (*FindNextComponent)(Component prev,ComponentDescription* desc);
 static    OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3);
 static    long (*CountComponents)(ComponentDescription* desc);
@@ -88,7 +88,7 @@
                                void *baseAddr,
                                long rowBytes); 
 static    OSErr           (*NewHandleClear)(Size byteCount);                          
-#endif /* #if !defined(MACOSX) */
+#endif /* #ifndef HAVE_QUICKTIME */
 
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){
@@ -107,7 +107,7 @@
     ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
 
     codec_initialized = 0;
-#ifdef MACOSX
+#ifdef HAVE_QUICKTIME
     EnterMovies();
 #else
 
@@ -154,7 +154,7 @@
     mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"InitializeQTML returned %li\n",result);
 //    result=EnterMovies();
 //    printf("EnterMovies->%d\n",result);
-#endif /* MACOSX */
+#endif /* HAVE_QUICKTIME */
 
 #if 0
     memset(&desc,0,sizeof(desc));
@@ -293,7 +293,7 @@
 
 // uninit driver
 static void uninit(sh_video_t *sh){
-#ifdef MACOSX
+#ifdef HAVE_QUICKTIME
     ExitMovies();
 #endif
 }