diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 02:18:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 05:04:32 +0300 |
| commit | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch) | |
| tree | b6b00fd57b24e713e0dc180b64d266b958df7daa /loader/vfl.c | |
| parent | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff) | |
| parent | dcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff) | |
| download | mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2 mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz | |
Merge svn changes up to r27092
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
Diffstat (limited to 'loader/vfl.c')
| -rw-r--r-- | loader/vfl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/loader/vfl.c b/loader/vfl.c index 91d28ee289..54d1076fa4 100644 --- a/loader/vfl.c +++ b/loader/vfl.c @@ -21,7 +21,7 @@ #include "wine/winestring.h" #include "wine/driver.h" #include "wine/avifmt.h" -#include "driver.h" +#include "drv.h" #define OpenDriverA DrvOpen #define CloseDriver DrvClose |