summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-30 14:06:33 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-30 14:06:33 +0000
commit5af496679d08ef9f1ada25ac90377cff9f834a5a (patch)
treeb7bbf01af3f1573e75a65c3486e7c47da7c014cc
parent4180db130e2f8d0939ea0000ba6af93d662c2013 (diff)
downloadmpv-5af496679d08ef9f1ada25ac90377cff9f834a5a.tar.bz2
mpv-5af496679d08ef9f1ada25ac90377cff9f834a5a.tar.xz
Remove loader/wine/avifmt.h #include, the AVI types declared there conflict
with the ones from libmpdemux/aviheader.h, which is #included below. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26612 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--TOOLS/vivodump.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/TOOLS/vivodump.c b/TOOLS/vivodump.c
index e7df375b33..fe1cd90d77 100644
--- a/TOOLS/vivodump.c
+++ b/TOOLS/vivodump.c
@@ -4,7 +4,6 @@
#include <inttypes.h>
#include "loader/wine/mmreg.h"
-#include "loader/wine/avifmt.h"
#include "loader/wine/vfw.h"
#include "stream/stream.h"