CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv28239/libmpcodecs Modified Files: vd_qtvideo.c ad_qtaudio.c Log Message: fix compilation on macosx with --enable-qtx patch by Zachary Bedell <zaclist@adirondack.net> Index: vd_qtvideo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtvideo.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- vd_qtvideo.c 28 Aug 2004 20:59:49 -0000 1.18 +++ vd_qtvideo.c 10 Oct 2004 19:51:17 -0000 1.19 @@ -32,7 +32,7 @@ #include "qtx/qtxsdk/components.h" #endif -#ifdef USE_QTX_CODECS +#if defined(USE_QTX_CODECS) && !defined(MACOSX) //#include "wine/windef.h" HMODULE WINAPI LoadLibraryA(LPCSTR); @@ -55,7 +55,7 @@ //static HINSTANCE qtml_dll; static HMODULE handler; -#ifdef USE_QTX_CODECS +#if defined(USE_QTX_CODECS) && !defined(MACOSX) 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); Index: ad_qtaudio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_qtaudio.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ad_qtaudio.c 28 Aug 2004 20:59:49 -0000 1.14 +++ ad_qtaudio.c 10 Oct 2004 19:51:18 -0000 1.15 @@ -30,7 +30,7 @@ LIBAD_EXTERN(qtaudio) -#ifdef USE_QTX_CODECS +#if defined(USE_QTX_CODECS) && !defined(MACOSX) typedef struct OpaqueSoundConverter* SoundConverter; typedef unsigned long OSType; typedef unsigned long UnsignedFixed;