Mercurial > mplayer.hg
view loader/loader.h @ 26146:20a126aaa756
ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.
I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).
author | uau |
---|---|
date | Thu, 06 Mar 2008 01:57:26 +0000 |
parents | a8ea87c71d18 |
children | 26f673ba0675 |
line wrap: on
line source
/******************************************************** Win32 binary loader interface Copyright 2000 Eugene Kuznetsov (divx@euro.ru) Shamelessly stolen from Wine project *********************************************************/ /* * Modified for use with MPlayer, detailed changelog at * http://svn.mplayerhq.hu/mplayer/trunk/ */ #ifndef MPLAYER_LOADER_H #define MPLAYER_LOADER_H #ifdef __cplusplus extern "C" { #endif #include "wine/windef.h" #include "wine/driver.h" #include "wine/mmreg.h" #include "wine/vfw.h" #include "wine/msacm.h" unsigned int GetPrivateProfileIntA_(const char* appname, const char* keyname, int default_value, const char* filename); int GetPrivateProfileStringA_(const char* appname, const char* keyname, const char* def_val, char* dest, unsigned int len, const char* filename); int WritePrivateProfileStringA_(const char* appname, const char* keyname, const char* string, const char* filename); INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ); #ifdef __cplusplus } #endif #endif /* MPLAYER_LOADER_H */