diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libmpcodecs/vd_qtvideo.c | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'libmpcodecs/vd_qtvideo.c')
| -rw-r--r-- | libmpcodecs/vd_qtvideo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index a79f7db490..33aa7b517a 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -4,7 +4,7 @@ #include "config.h" -#ifdef HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME #include <QuickTime/ImageCodec.h> #define dump_ImageDescription(x) #endif @@ -30,7 +30,7 @@ LIBVD_EXTERN(qtvideo) #include "mpbswap.h" -#ifndef HAVE_QUICKTIME +#ifndef CONFIG_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; -#ifndef HAVE_QUICKTIME +#ifndef CONFIG_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 /* #ifndef HAVE_QUICKTIME */ +#endif /* #ifndef CONFIG_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 HAVE_QUICKTIME +#ifdef CONFIG_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 /* HAVE_QUICKTIME */ +#endif /* CONFIG_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 HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME ExitMovies(); #endif } |