RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-14 19:11:53 +00:00
Code Issues Releases Wiki Activity

ve_vfw.c: #include aviheader.h instead of wine avifmt.h

Browse Source 
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
This commit is contained in:
uau 2008-03-06 01:57:26 +00:00
parent edc39ca57e
commit a0a5afc0c5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpcodecs/ve_vfw.c
View File

@ -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"