# HG changeset patch # User diego # Date 1205572778 0 # Node ID 36ba5069e6f4ee121014e0fa2ec07ea6b636d380 # Parent 4980ed598e8ac0d1fe77685b9a468b3e352484b9 MACOSX_COREVIDEO --> corevideo diff -r 4980ed598e8a -r 36ba5069e6f4 configure --- a/configure Sat Mar 15 08:54:21 2008 +0000 +++ b/configure Sat Mar 15 09:19:38 2008 +0000 @@ -3599,12 +3599,12 @@ _vosrc="$_vosrc vo_macosx.m" _vomodules="macosx $_vomodules" _ld_extra="$_ld_extra -framework Cocoa -framework QuartzCore -framework OpenGL" - _def_macosx_corevideo='#define MACOSX_COREVIDEO 1' - _macosx_corevideo=yes + _def_corevideo='#define HAVE_COREVIDEO 1' + _corevideo=yes else _novomodules="macosx $_novomodules" - _def_macosx_corevideo='#undef MACOSX_COREVIDEO' - _macosx_corevideo=no + _def_corevideo='#undef HAVE_COREVIDEO' + _corevideo=no fi fi echores "$_macosx" @@ -7797,7 +7797,7 @@ MACOSX_FINDER_SUPPORT = $_macosx_finder_support MACOSX_BUNDLE = $_macosx_bundle COREAUDIO = $_coreaudio -MACOSX_COREVIDEO = $_macosx_corevideo +COREVIDEO = $_corevideo TOOLAME=$_toolame TWOLAME=$_twolame FAAC=$_faac @@ -8173,7 +8173,7 @@ $_def_macosx_finder_support $_def_macosx_bundle $_def_coreaudio -$_def_macosx_corevideo +$_def_corevideo /* Build our Win32-loader */ $_def_win32_loader diff -r 4980ed598e8a -r 36ba5069e6f4 libvo/video_out.c --- a/libvo/video_out.c Sat Mar 15 08:54:21 2008 +0000 +++ b/libvo/video_out.c Sat Mar 15 09:19:38 2008 +0000 @@ -124,7 +124,7 @@ #ifdef HAVE_DIRECTX &video_out_directx, #endif -#ifdef MACOSX_COREVIDEO +#ifdef HAVE_COREVIDEO &video_out_macosx, #endif #ifdef MACOSX