Mercurial > mplayer.hg

changeset 26213:893103b2b11c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a separate definition for quartz.
author diego
date Sat, 15 Mar 2008 09:49:14 +0000
parents 876d2f3f71f9
children 6fda8dde2044
files configure libvo/video_out.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat Mar 15 09:28:33 2008 +0000
+++ b/configure	Sat Mar 15 09:49:14 2008 +0000
@@ -3580,6 +3580,7 @@
     _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 @@
     _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_BUNDLE = $_macosx_bundle
 COREAUDIO = $_coreaudio
 COREVIDEO = $_corevideo
+QUARTZ = $_quartz
 TOOLAME=$_toolame
 TWOLAME=$_twolame
 FAAC=$_faac
@@ -8174,6 +8177,7 @@
 $_def_macosx_bundle
 $_def_coreaudio
 $_def_corevideo
+$_def_quartz
 
 /* Build our Win32-loader */
 $_def_win32_loader
--- a/libvo/video_out.c	Sat Mar 15 09:28:33 2008 +0000
+++ b/libvo/video_out.c	Sat Mar 15 09:49:14 2008 +0000
@@ -127,7 +127,7 @@
 #ifdef HAVE_COREVIDEO
 	&video_out_macosx,
 #endif
-#ifdef MACOSX
+#ifdef HAVE_QUARTZ
 	&video_out_quartz,
 #endif
 #ifdef HAVE_XMGA