summaryrefslogtreecommitdiffstats
path: root/vidix/unichrome_vid.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-23 03:58:44 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-23 03:58:44 +0300
commitde560e8167c21a8fd9ea34f5f42f377102d65232 (patch)
treed5ef49221ccbb17308b0d14a96e6bd8cfba5916f /vidix/unichrome_vid.c
parent68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff)
parent5eee4632d3e2bcf17a29483467d247c71c202e0d (diff)
downloadmpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2
mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz
Merge svn changes up to r27123
Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
Diffstat (limited to 'vidix/unichrome_vid.c')
-rw-r--r--vidix/unichrome_vid.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/vidix/unichrome_vid.c b/vidix/unichrome_vid.c
index 15b86fc662..796b7e5885 100644
--- a/vidix/unichrome_vid.c
+++ b/vidix/unichrome_vid.c
@@ -32,7 +32,6 @@
#include "config.h"
#include "vidix.h"
-#include "vidixlib.h"
#include "fourcc.h"
#include "dha.h"
#include "pci_ids.h"