Mercurial > mplayer.hg
changeset 31348:8df8a7c20f46
Replace forward declarations by proper loader/wine/winbase.h #include.
| author | diego |
|---|---|
| date | Mon, 14 Jun 2010 14:35:57 +0000 |
| parents | eb324c0f17f6 |
| children | 92d75e703bc0 |
| files | libmpcodecs/ad_qtaudio.c libmpcodecs/vd_qtvideo.c libmpcodecs/ve_qtvideo.c libmpdemux/demux_avs.c |
| diffstat | 4 files changed, 5 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ad_qtaudio.c Mon Jun 14 14:19:58 2010 +0000 +++ b/libmpcodecs/ad_qtaudio.c Mon Jun 14 14:35:57 2010 +0000 @@ -30,6 +30,7 @@ #include <QuickTime/QuickTimeComponents.h> #else #include "loader/ldt_keeper.h" +#include "loader/wine/winbase.h" #include "loader/wine/windef.h" #endif @@ -95,10 +96,6 @@ #define siDecompressionParams 2002876005 // siDecompressionParams = FOUR_CHAR_CODE('wave') -HMODULE WINAPI LoadLibraryA(LPCSTR); -FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); -int WINAPI FreeLibrary(HMODULE); - static int loader_init(void) {
--- a/libmpcodecs/vd_qtvideo.c Mon Jun 14 14:19:58 2010 +0000 +++ b/libmpcodecs/vd_qtvideo.c Mon Jun 14 14:35:57 2010 +0000 @@ -31,6 +31,7 @@ #else #include "loader/ldt_keeper.h" #include "loader/qtx/qtxsdk/components.h" +#include "loader/wine/winbase.h" #include "loader/wine/windef.h" #endif @@ -52,9 +53,6 @@ static ImageSequence imageSeq; #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 OSErr (*InitializeQTML)(long flags);
--- a/libmpcodecs/ve_qtvideo.c Mon Jun 14 14:19:58 2010 +0000 +++ b/libmpcodecs/ve_qtvideo.c Mon Jun 14 14:35:57 2010 +0000 @@ -35,6 +35,7 @@ #endif #include "loader/qtx/qtxsdk/components.h" +#include "loader/wine/winbase.h" #include "loader/wine/windef.h" #include "codec-cfg.h" @@ -49,9 +50,7 @@ #include "mp_image.h" #include "vf.h" -HMODULE WINAPI LoadLibraryA(LPCSTR); -FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); -int WINAPI FreeLibrary(HMODULE); + static HINSTANCE qtime_qts; //handle to preloaded quicktime.qts static HMODULE handler;
--- a/libmpdemux/demux_avs.c Mon Jun 14 14:19:58 2010 +0000 +++ b/libmpdemux/demux_avs.c Mon Jun 14 14:35:57 2010 +0000 @@ -33,6 +33,7 @@ #include "stheader.h" #include "libvo/fastmemcpy.h" +#include "loader/wine/winbase.h" #include "loader/wine/windef.h" #ifdef WIN32_LOADER @@ -43,10 +44,6 @@ #define MAX_AVS_SIZE 16 * 1024 /* 16k should be enough */ -HMODULE WINAPI LoadLibraryA(LPCSTR); -FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); -int WINAPI FreeLibrary(HMODULE); - typedef WINAPI AVS_ScriptEnvironment* (*imp_avs_create_script_environment)(int version); typedef WINAPI AVS_Value (*imp_avs_invoke)(AVS_ScriptEnvironment *, const char * name, AVS_Value args, const char** arg_names); typedef WINAPI const AVS_VideoInfo *(*imp_avs_get_video_info)(AVS_Clip *);