diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-06 01:57:26 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-06 01:57:26 +0000 |
| commit | a0a5afc0c5e67868b27f2fb9c238f00e73dce940 (patch) | |
| tree | acb3c0c259d21a1b4c201ed3753e6f90739e1139 /libmpcodecs | |
| parent | edc39ca57eb95342d9af0e30954ebaa6566e51ae (diff) | |
| download | mpv-a0a5afc0c5e67868b27f2fb9c238f00e73dce940.tar.bz2 mpv-a0a5afc0c5e67868b27f2fb9c238f00e73dce940.tar.xz | |
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).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26178 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ve_vfw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 414cb6cf07..f5a8d7004c 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -18,7 +18,7 @@ #include "loader/loader.h" //#include "loader/wine/mmreg.h" #include "loader/wine/vfw.h" -#include "loader/wine/avifmt.h" +#include "libmpdemux/aviheader.h" #include "loader/wine/winerror.h" #include "loader/wine/objbase.h" |