diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libmpcodecs/vd_qtvideo.c | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libmpcodecs/vd_qtvideo.c')
-rw-r--r-- | libmpcodecs/vd_qtvideo.c | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index 9b5ad87165..8b32cf9a6d 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -3,19 +3,17 @@ #include <inttypes.h> #include "config.h" +#include "mp_msg.h" +#include "mpbswap.h" +#include "vd_internal.h" #ifdef CONFIG_QUICKTIME #include <QuickTime/ImageCodec.h> #define dump_ImageDescription(x) -#endif - -#include "loader/wine/windef.h" - -#include "mp_msg.h" -#include "vd_internal.h" - -#ifdef WIN32_LOADER +#else #include "loader/ldt_keeper.h" +#include "loader/qtx/qtxsdk/components.h" +#include "loader/wine/windef.h" #endif static const vd_info_t info = { @@ -28,16 +26,6 @@ static const vd_info_t info = { LIBVD_EXTERN(qtvideo) -#include "mpbswap.h" - -#ifndef CONFIG_QUICKTIME -#include "loader/qtx/qtxsdk/components.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 //static CodecInfo cinfo; // for ImageCodecGetCodecInfo() @@ -50,10 +38,13 @@ static Rect OutBufferRect; //the dimensions of our GWorld static GWorldPtr OutBufferGWorld = NULL;//a GWorld is some kind of description for a drawing environment static ImageDescriptionHandle framedescHandle; -static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts -static HMODULE handler; #ifndef CONFIG_QUICKTIME +HMODULE WINAPI LoadLibraryA(LPCSTR); +FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); +int WINAPI FreeLibrary(HMODULE); +static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts +static HMODULE handler; 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); @@ -93,7 +84,9 @@ static int codec_initialized=0; // init driver static int init(sh_video_t *sh){ +#ifndef CONFIG_QUICKTIME long result = 1; +#endif ComponentResult cres; ComponentDescription desc; Component prev=NULL; |