diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-19 00:29:24 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-19 00:29:24 +0200 |
| commit | 71b25cca7644ab059393e9ee4682d79aab41ceba (patch) | |
| tree | ce2017db0a47e61b280ff41c00dccedae77fbd1d /libvo | |
| parent | a3ab9e8e4649601281f78949e56b92755ae1142a (diff) | |
| parent | b8830753f103748e8faa630ba636c845263906ce (diff) | |
| download | mpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.bz2 mpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.xz | |
Merge svn changes up to r28162
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/video_out.c | 2 | ||||
| -rw-r--r-- | libvo/vo_directx.c | 1 | ||||
| -rw-r--r-- | libvo/vo_quartz.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 5ca841ec55..e587932959 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -213,7 +213,7 @@ const struct vo_driver *video_out_drivers[] = #endif &video_out_null, // should not be auto-selected -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC &video_out_xvmc, #endif &video_out_mpegpes, diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index f492d957d3..7d4feaa5e5 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -37,6 +37,7 @@ #include "aspect.h" #include "geometry.h" #include "mp_fifo.h" +#include "sub.h" #ifdef CONFIG_GUI #include "gui/interface.h" diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index f8b760e097..880efe5eb2 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -30,7 +30,7 @@ #include "m_option.h" #include "mp_fifo.h" #include "mpbswap.h" -#include "libvo/sub.h" +#include "sub.h" #include "input/input.h" #include "input/mouse.h" |