# HG changeset patch # User diego # Date 1209564393 0 # Node ID 0abcf0f3d845312226d31c853792edcc04580add # Parent 647abf37a8256cf261963a5c5dd97900af670eea Remove loader/wine/avifmt.h #include, the AVI types declared there conflict with the ones from libmpdemux/aviheader.h, which is #included below. diff -r 647abf37a825 -r 0abcf0f3d845 TOOLS/vivodump.c --- a/TOOLS/vivodump.c Wed Apr 30 14:03:32 2008 +0000 +++ b/TOOLS/vivodump.c Wed Apr 30 14:06:33 2008 +0000 @@ -4,7 +4,6 @@ #include #include "loader/wine/mmreg.h" -#include "loader/wine/avifmt.h" #include "loader/wine/vfw.h" #include "stream/stream.h"