[FFmpeg-cvslog] Allow AVFoundation compilation on OS X 10.7.

Carl Eugen Hoyos git at videolan.org
Wed Mar 4 23:56:34 CET 2015


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Mar  4 23:54:10 2015 +0100| [83808ee7e9e89b0c83d5ecd94b35952c44716b68] | committer: Carl Eugen Hoyos

Allow AVFoundation compilation on OS X 10.7.

Fixes ticket #4238.

Reviewed-by: Thilo Borgmann

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83808ee7e9e89b0c83d5ecd94b35952c44716b68
---

 configure |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index aff3d98..d641d9f 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"; }



More information about the ffmpeg-cvslog mailing list