summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-30 23:58:07 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-30 23:58:07 +0000
commitdc4b6fcddc8dcbac2adc52ea0e9c8e74caac029f (patch)
tree1fade112356cc20c8e37b406a812a177dd678f92
parent0927520cbb614d576a83ae70fdf9275c23147cc5 (diff)
downloadmpv-dc4b6fcddc8dcbac2adc52ea0e9c8e74caac029f.tar.bz2
mpv-dc4b6fcddc8dcbac2adc52ea0e9c8e74caac029f.tar.xz
Make CONFIG_XVMC a proper FFmpeg-style 0/1 definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28402 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure2
-rw-r--r--libvo/video_out.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 93242659b8..4ff74eb382 100755
--- a/configure
+++ b/configure
@@ -4236,7 +4236,7 @@ if test "$_xvmc" = yes ; then
_vomodules="xvmc $_vomodules"
_res_comment="using $_xvmclib"
else
- _def_xvmc='#undef CONFIG_XVMC'
+ _def_xvmc='#define CONFIG_XVMC 0'
_novomodules="xvmc $_novomodules"
_libavdecoders=`echo $_libavdecoders | sed -e s/MPEG_XVMC_DECODER// `
fi
diff --git a/libvo/video_out.c b/libvo/video_out.c
index c65f3a5710..e277a35c55 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -225,7 +225,7 @@ const vo_functions_t* const video_out_drivers[] =
#endif
&video_out_null,
// should not be auto-selected
-#ifdef CONFIG_XVMC
+#if CONFIG_XVMC
&video_out_xvmc,
#endif
&video_out_mpegpes,