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 /vidix/drivers.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 'vidix/drivers.c')
| -rw-r--r-- | vidix/drivers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vidix/drivers.c b/vidix/drivers.c index cf26cf94dc..483428ff3b 100644 --- a/vidix/drivers.c +++ b/vidix/drivers.c @@ -25,7 +25,7 @@ #include <string.h> #include "config.h" -#include "vidixlib.h" +#include "vidix.h" #include "libavutil/common.h" #include "mpbswap.h" #include "config.h" |