diff options
| author | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-05 00:17:27 +0000 |
|---|---|---|
| committer | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-05 00:17:27 +0000 |
| commit | 6516ffdb7da37363c91ad9267121682774617b04 (patch) | |
| tree | 1faa08fc03a82d2d6cfe959374ac134ca38b3356 | |
| parent | 97ce3e88b809651535d0f1650dc997e76569b196 (diff) | |
| download | mpv-6516ffdb7da37363c91ad9267121682774617b04.tar.bz2 mpv-6516ffdb7da37363c91ad9267121682774617b04.tar.xz | |
do not define video_out_macosx if corevideo is not present
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15348 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libvo/video_out.c | 4 |
2 files changed, 10 insertions, 0 deletions
@@ -3213,8 +3213,12 @@ EOF _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 = $_macosx 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_dshow $_def_macosx $_def_macosx_finder_support $_def_macosx_bundle +$_def_macosx_corevideo /* Build our Win32-loader */ $_def_win32_loader diff --git a/libvo/video_out.c b/libvo/video_out.c index 06de9dabed..8f72095460 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -121,7 +121,9 @@ extern vo_functions_t video_out_tdfx_vid; 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 @@ vo_functions_t* video_out_drivers[] = &video_out_directx, #endif #ifdef MACOSX +#ifdef MACOSX_COREVIDEO &video_out_macosx, +#endif &video_out_quartz, #endif #ifdef HAVE_XMGA |