aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-03-04 23:54:10 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-03-04 23:54:10 +0100
commit83808ee7e9e89b0c83d5ecd94b35952c44716b68 (patch)
treeeb8a7c60ec62f86c5d7b1b2f68cb1047278d186e
parent63c9b6e431b8eaa027dfabc0518841fb800b34ef (diff)
downloadffmpeg-83808ee7e9e89b0c83d5ecd94b35952c44716b68.tar.gz
Allow AVFoundation compilation on OS X 10.7.
Fixes ticket #4238. Reviewed-by: Thilo Borgmann
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index aff3d986b2..d641d9f658 100755
--- a/configure
+++ b/configure
@@ -2493,7 +2493,7 @@ xwma_demuxer_select="riffdec"
# indevs / outdevs
alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
alsa_outdev_deps="alsa_asoundlib_h"
-avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framework AVFoundation -framework CoreMedia -framework CoreGraphics"
+avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framework AVFoundation -framework CoreMedia"
avfoundation_indev_select="avfoundation"
bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
caca_outdev_deps="libcaca"
@@ -4881,6 +4881,8 @@ done
# these are off by default, so fail if requested and not available
enabled avfoundation_indev && { check_header_oc AVFoundation/AVFoundation.h || disable avfoundation_indev; }
+enabled avfoundation_indev && { check_lib2 CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics ||
+ check_lib2 ApplicationServices/ApplicationServices.h CGGetActiveDisplayList -framework ApplicationServices; }
enabled avisynth && { { check_lib2 "windows.h" LoadLibrary; } ||
{ check_lib2 "dlfcn.h" dlopen -ldl; } ||
die "ERROR: LoadLibrary/dlopen not found for avisynth"; }