diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-25 15:39:36 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-25 15:39:36 +0000 |
| commit | e8f2dabe9bb31b0edc69254ed83dbe6479499171 (patch) | |
| tree | 4a6dbeec7aa0902aac6279790bb4e606497b731a /libmpcodecs/vd_qtvideo.c | |
| parent | 2639766080f6b7185b78e8788b7b6dccd36e8891 (diff) | |
| download | mpv-e8f2dabe9bb31b0edc69254ed83dbe6479499171.tar.bz2 mpv-e8f2dabe9bb31b0edc69254ed83dbe6479499171.tar.xz | |
MACOSX support patch, based on Dan Christiansens work
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9503 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_qtvideo.c')
| -rw-r--r-- | libmpcodecs/vd_qtvideo.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index 56358f4be9..ad8de4df70 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -3,7 +3,7 @@ #include "config.h" -#ifdef USE_QTX_CODECS +#if defined(USE_QTX_CODECS) || defined(MACOSX) #include "mp_msg.h" #include "vd_internal.h" @@ -23,13 +23,21 @@ static vd_info_t info = { LIBVD_EXTERN(qtvideo) #include "../bswap.h" + +#ifdef MACOSX +#include <QuickTime/ImageCodec.h> +#define dump_ImageDescription(x) +#else #include "qtx/qtxsdk/components.h" +#endif +#ifdef USE_QTX_CODECS //#include "wine/windef.h" HMODULE WINAPI LoadLibraryA(LPCSTR); FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); int WINAPI FreeLibrary(HMODULE); +#endif //static ComponentDescription desc; // for FindNextComponent() static ComponentInstance ci=NULL; // codec handle @@ -46,6 +54,7 @@ static ImageDescriptionHandle framedescHandle; //static HINSTANCE qtml_dll; static HMODULE handler; +#ifdef USE_QTX_CODECS 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); @@ -80,7 +89,7 @@ static OSErr (*QTNewGWorldFromPtr)(GWorldPtr *gw, void *baseAddr, long rowBytes); static OSErr (*NewHandleClear)(Size byteCount); - +#endif // to set/get/query special features/parameters static int control(sh_video_t *sh,int cmd,void* arg,...){ @@ -98,6 +107,10 @@ static int init(sh_video_t *sh){ CodecInfo cinfo; // for ImageCodecGetCodecInfo() ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize() +#ifdef MACOSX + EnterMovies(); +#else + #ifdef WIN32_LOADER Setup_LDT_Keeper(); #endif @@ -130,6 +143,7 @@ static int init(sh_video_t *sh){ printf("InitializeQTML returned %i\n",result); // result=EnterMovies(); // printf("EnterMovies->%d\n",result); +#endif /* !MACOSX */ #if 0 memset(&desc,0,sizeof(desc)); @@ -268,6 +282,9 @@ static int init(sh_video_t *sh){ // uninit driver static void uninit(sh_video_t *sh){ +#ifdef MACOSX + ExitMovies(); +#endif } // decode a frame |