summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-15 09:19:38 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-15 09:19:38 +0000
commit5e49bb2dd2e3afd39e916ce096f227f34084ff39 (patch)
tree345209cc7c008330645be0bb98a15e2d8497cf53
parentf9da8542dd0caa5455b34bc2b09e250ad01b4a3c (diff)
downloadmpv-5e49bb2dd2e3afd39e916ce096f227f34084ff39.tar.bz2
mpv-5e49bb2dd2e3afd39e916ce096f227f34084ff39.tar.xz
MACOSX_COREVIDEO --> corevideo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26241 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure12
-rw-r--r--libvo/video_out.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/configure b/configure
index fb47ec4a62..76a666922a 100755
--- a/configure
+++ b/configure
@@ -3599,12 +3599,12 @@ EOF
_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 = $_macosx
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
$_def_macosx_finder_support
$_def_macosx_bundle
$_def_coreaudio
-$_def_macosx_corevideo
+$_def_corevideo
/* Build our Win32-loader */
$_def_win32_loader
diff --git a/libvo/video_out.c b/libvo/video_out.c
index f22e1eee37..4787798ec4 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -124,7 +124,7 @@ const vo_functions_t* const video_out_drivers[] =
#ifdef HAVE_DIRECTX
&video_out_directx,
#endif
-#ifdef MACOSX_COREVIDEO
+#ifdef HAVE_COREVIDEO
&video_out_macosx,
#endif
#ifdef MACOSX