summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-15 09:49:14 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-15 09:49:14 +0000
commitb5fb7e831efde2bff48fae8bdd32e2bc877a2253 (patch)
tree5e6ee314f5fbf274b03ef8dd9c277262d9e7f8c4
parentebd1b1f8f91702c66c855f0ba7e33697a9da6dc9 (diff)
downloadmpv-b5fb7e831efde2bff48fae8bdd32e2bc877a2253.tar.bz2
mpv-b5fb7e831efde2bff48fae8bdd32e2bc877a2253.tar.xz
Add a separate definition for quartz.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26245 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure4
-rw-r--r--libvo/video_out.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index cb514b940c..a689e93c50 100755
--- a/configure
+++ b/configure
@@ -3580,6 +3580,7 @@ EOF
_def_coreaudio='#define HAVE_COREAUDIO 1'
_aosrc="$_aosrc ao_macosx.c"
_aomodules="macosx $_aomodules"
+ _def_quartz='#define HAVE_QUARTZ 1'
_vosrc="$_vosrc vo_quartz.c"
_vomodules="quartz $_vomodules"
else
@@ -3588,6 +3589,7 @@ EOF
_def_macosx='#undef MACOSX'
_def_coreaudio='#undef HAVE_COREAUDIO'
_noaomodules="macosx $_noaomodules"
+ _def_quartz='#undef HAVE_QUARTZ'
_novomodules="quartz $_novomodules"
fi
cat > $TMPC <<EOF
@@ -7798,6 +7800,7 @@ MACOSX_FINDER_SUPPORT = $_macosx_finder_support
MACOSX_BUNDLE = $_macosx_bundle
COREAUDIO = $_coreaudio
COREVIDEO = $_corevideo
+QUARTZ = $_quartz
TOOLAME=$_toolame
TWOLAME=$_twolame
FAAC=$_faac
@@ -8174,6 +8177,7 @@ $_def_macosx_finder_support
$_def_macosx_bundle
$_def_coreaudio
$_def_corevideo
+$_def_quartz
/* Build our Win32-loader */
$_def_win32_loader
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 4787798ec4..762ef7cdcb 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -127,7 +127,7 @@ const vo_functions_t* const video_out_drivers[] =
#ifdef HAVE_COREVIDEO
&video_out_macosx,
#endif
-#ifdef MACOSX
+#ifdef HAVE_QUARTZ
&video_out_quartz,
#endif
#ifdef HAVE_XMGA