diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-15 11:31:28 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-15 11:31:28 +0000 |
commit | 9e1ccf7447fb3e43df6d93a8be2b232a393a6157 (patch) | |
tree | abfdbd48fa4b43cb0331f27bb8e0f2d8e677287d /libmpcodecs | |
parent | 6628c4ba3b7818d3a3e9006339b44de29e116c9e (diff) | |
download | mpv-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')
-rw-r--r-- | libmpcodecs/ad_qtaudio.c | 10 | ||||
-rw-r--r-- | libmpcodecs/vd_qtvideo.c | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index da4feec1ab..8e65bab0c4 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -5,7 +5,7 @@ #include "config.h" -#ifdef MACOSX +#ifdef HAVE_QUICKTIME #include <QuickTime/QuickTimeComponents.h> #endif @@ -30,7 +30,7 @@ static ad_info_t info = { LIBAD_EXTERN(qtaudio) -#if !defined(MACOSX) +#ifndef HAVE_QUICKTIME typedef struct OpaqueSoundConverter* SoundConverter; typedef unsigned long OSType; typedef unsigned long UnsignedFixed; @@ -164,7 +164,7 @@ static int loader_init() mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n"); return 0; } -#endif /* #if !defined(MACOSX) */ +#endif /* #ifndef HAVE_QUICKTIME */ static SoundConverter myConverter = NULL; static SoundComponentData InputFormatInfo,OutputFormatInfo; @@ -180,7 +180,7 @@ static int preinit(sh_audio_t *sh){ unsigned long WantedBufferSize=0; //the size you want your buffers to be -#ifdef MACOSX +#ifdef HAVE_QUICKTIME EnterMovies(); #else if(loader_init()) return 0; // failed to load DLL @@ -280,7 +280,7 @@ static void uninit(sh_audio_t *sh){ // FreeLibrary( qtime_qts ); // qtime_qts = NULL; // printf("qt dll loader uninit done\n"); -#ifdef MACOSX +#ifdef HAVE_QUICKTIME ExitMovies(); #endif } 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 } |