diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:01:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:01:15 +0200 |
| commit | 0dce155dd3e52d24c7a0ffbd4be9461170d53de3 (patch) | |
| tree | 0d675e2bbd3fa90303f72708b8533d5d068278f4 /loader | |
| parent | db7fe7ce92a229c6529b9b6b2894f325a778ead2 (diff) | |
| parent | 22e310b9aef77477e022874beb388514911ead1e (diff) | |
| download | mpv-0dce155dd3e52d24c7a0ffbd4be9461170d53de3.tar.bz2 mpv-0dce155dd3e52d24c7a0ffbd4be9461170d53de3.tar.xz | |
Merge svn changes up to r30694
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/win32.c | 2 | ||||
| -rw-r--r-- | loader/wine/vfw.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/loader/win32.c b/loader/win32.c index b2e88a5a6d..3174c4e17d 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -24,7 +24,9 @@ for DLL to know too much about its environment. /* Hack to make sure the correct function declaration in com.h is used when * this file is built for the test applications with WIN32_LOADER disabled. */ +#ifndef WIN32_LOADER #define WIN32_LOADER +#endif #ifdef CONFIG_QTX_CODECS #define PSEUDO_SCREEN_WIDTH /*640*/800 diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index 7bf72be42d..89c76c3ef2 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -207,6 +207,9 @@ typedef struct { void* lpPrev; } ICCOMPRESS; + +long VFWAPI VideoForWindowsVersion(void); + long VFWAPIV ICCompress( HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiOutput,void* lpData, LPBITMAPINFOHEADER lpbiInput,void* lpBits,long* lpckid, |