diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /libvo/vo_winvidix.c | |
parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
download | mpv-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 'libvo/vo_winvidix.c')
-rw-r--r-- | libvo/vo_winvidix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c index 2b35d6abfe..2581310596 100644 --- a/libvo/vo_winvidix.c +++ b/libvo/vo_winvidix.c @@ -25,7 +25,7 @@ #include "mp_fifo.h" #include "vosub_vidix.h" -#include "vidix/vidixlib.h" +#include "vidix/vidix.h" static const vo_info_t info = |