summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_qtvideo.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-15 11:31:28 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-15 11:31:28 +0000
commit9e1ccf7447fb3e43df6d93a8be2b232a393a6157 (patch)
treeabfdbd48fa4b43cb0331f27bb8e0f2d8e677287d /libmpcodecs/vd_qtvideo.c
parent6628c4ba3b7818d3a3e9006339b44de29e116c9e (diff)
downloadmpv-9e1ccf7447fb3e43df6d93a8be2b232a393a6157.tar.bz2
mpv-9e1ccf7447fb3e43df6d93a8be2b232a393a6157.tar.xz
Introduce HAVE_QUICKTIME definition and use it where appropriate.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26248 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_qtvideo.c')
-rw-r--r--libmpcodecs/vd_qtvideo.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index b23a8f2ee1..6dcd2b44c4 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -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 @@ LIBVD_EXTERN(qtvideo)
#include "bswap.h"
-#ifndef MACOSX
+#ifndef HAVE_QUICKTIME
#include "loader/qtx/qtxsdk/components.h"
HMODULE WINAPI LoadLibraryA(LPCSTR);
@@ -53,7 +53,7 @@ static ImageDescriptionHandle framedescHandle;
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 @@ static OSErr (*QTNewGWorldFromPtr)(GWorldPtr *gw,
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 @@ static int init(sh_video_t *sh){
ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
codec_initialized = 0;
-#ifdef MACOSX
+#ifdef HAVE_QUICKTIME
EnterMovies();
#else
@@ -154,7 +154,7 @@ static int init(sh_video_t *sh){
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 @@ static int init(sh_video_t *sh){
// uninit driver
static void uninit(sh_video_t *sh){
-#ifdef MACOSX
+#ifdef HAVE_QUICKTIME
ExitMovies();
#endif
}