# HG changeset patch
# User nplourde
# Date 1115252247 0
# Node ID 18d404eebb28d22b3b9dcf3bd7a7ac90b185d395
# Parent  cdffac8b6555c313b8bcc2a411a3d8d714fa8903
do not define video_out_macosx if corevideo is not present

diff -r cdffac8b6555 -r 18d404eebb28 configure
--- a/configure	Wed May 04 21:40:32 2005 +0000
+++ b/configure	Thu May 05 00:17:27 2005 +0000
@@ -3213,8 +3213,12 @@
 		_vosrc="$_vosrc vo_macosx.m"
 		_vomodules="macosx $_vomodules"
 		_macosx_frameworks="$_macosx_frameworks -framework Cocoa -framework QuartzCore -framework OpenGL"
+		_def_macosx_corevideo='#define MACOSX_COREVIDEO 1'
+		_macosx_corevideo=yes
 	else
 		_novomodules="macosx $_novomodules"
+		_def_macosx_corevideo='#undef MACOSX_COREVIDEO'
+		_macosx_corevideo=no
 	fi
 fi
 echores "$_macosx"
@@ -6891,6 +6895,7 @@
 MACOSX_FINDER_SUPPORT = $_macosx_finder_support
 MACOSX_BUNDLE = $_macosx_bundle
 MACOSX_FRAMEWORKS = $_macosx_frameworks
+MACOSX_COREVIDEO = $_macosx_corevideo
 TOOLAME=$_toolame
 TOOLAME_EXTRAFLAGS=$_toolame_extraflags
 TOOLAME_LIB=$_toolame_lib
@@ -7201,6 +7206,7 @@
 $_def_macosx
 $_def_macosx_finder_support
 $_def_macosx_bundle
+$_def_macosx_corevideo
 
 /* Build our Win32-loader */
 $_def_win32_loader
diff -r cdffac8b6555 -r 18d404eebb28 libvo/video_out.c
--- a/libvo/video_out.c	Wed May 04 21:40:32 2005 +0000
+++ b/libvo/video_out.c	Thu May 05 00:17:27 2005 +0000
@@ -121,7 +121,9 @@
 extern vo_functions_t video_out_tga;
 #endif
 #ifdef MACOSX
+#ifdef MACOSX_COREVIDEO
 extern vo_functions_t video_out_macosx;
+#endif
 extern vo_functions_t video_out_quartz;
 #endif
 #ifdef HAVE_PNM
@@ -140,7 +142,9 @@
         &video_out_directx,
 #endif
 #ifdef MACOSX
+#ifdef MACOSX_COREVIDEO
 	&video_out_macosx,
+#endif
 	&video_out_quartz,
 #endif
 #ifdef HAVE_XMGA