Mercurial > mplayer.hg
changeset 15347:18d404eebb28
do not define video_out_macosx if corevideo is not present
| author | nplourde |
|---|---|
| date | Thu, 05 May 2005 00:17:27 +0000 |
| parents | cdffac8b6555 |
| children | 02bc9f03a2ef |
| files | configure libvo/video_out.c |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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