summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_qtvideo.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-21 14:49:09 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-21 14:49:09 +0000
commit60f223f76664437afda078bc46f4a0f1dedcbb06 (patch)
tree3d80a62a8de131c40f9ef9074502349018a2c5f7 /libmpcodecs/vd_qtvideo.c
parent6b050a4ed003c9e411b80cf239884d164d912fc6 (diff)
downloadmpv-60f223f76664437afda078bc46f4a0f1dedcbb06.tar.bz2
mpv-60f223f76664437afda078bc46f4a0f1dedcbb06.tar.xz
Move #ifdefs around complete files into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18774 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_qtvideo.c')
-rw-r--r--libmpcodecs/vd_qtvideo.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index 20e68d6ab3..c1337dbe8d 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -3,7 +3,6 @@
#include "config.h"
-#if defined(USE_QTX_CODECS) || defined(MACOSX)
#include "wine/windef.h"
#include "mp_msg.h"
@@ -30,11 +29,7 @@ LIBVD_EXTERN(qtvideo)
#define dump_ImageDescription(x)
#else
#include "qtx/qtxsdk/components.h"
-#endif
-
-#if defined(USE_QTX_CODECS) && !defined(MACOSX)
//#include "wine/windef.h"
-
HMODULE WINAPI LoadLibraryA(LPCSTR);
FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR);
int WINAPI FreeLibrary(HMODULE);
@@ -55,7 +50,7 @@ static ImageDescriptionHandle framedescHandle;
static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
static HMODULE handler;
-#if defined(USE_QTX_CODECS) && !defined(MACOSX)
+#if !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);
@@ -90,7 +85,7 @@ static OSErr (*QTNewGWorldFromPtr)(GWorldPtr *gw,
void *baseAddr,
long rowBytes);
static OSErr (*NewHandleClear)(Size byteCount);
-#endif /* #if defined(USE_QTX_CODECS) && !defined(MACOSX) */
+#endif /* #if !defined(MACOSX) */
// to set/get/query special features/parameters
static int control(sh_video_t *sh,int cmd,void* arg,...){
@@ -438,4 +433,3 @@ if((int)sh->context==0x73797639){ // Sorenson 16-bit YUV -> std YVU9
return mpi;
}
-#endif /* #if defined(USE_QTX_CODECS) || defined(MACOSX) */