From: Clément Bœsch <cboe...@gopro.com>
- there is no need for kCVImageBufferColorPrimaries_ITU_R_2020 checks,
it's done at runtime
- VideoToolbox presence is now checked with check_apple_framework()
- link to CoreServices is only done when videotoolbox is enabled
---
configure | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index a91bc9f58a..b52aad49f4 100755
--- a/configure
+++ b/configure
@@ -1607,7 +1607,6 @@ EXTERNAL_LIBRARY_LIST="
openal
opencl
opengl
- videotoolbox
"
HWACCEL_AUTODETECT_LIBRARY_LIST="
@@ -1621,7 +1620,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST="
vaapi
vda
vdpau
- videotoolbox_hwaccel
+ videotoolbox
xvmc
"
@@ -2178,7 +2177,6 @@ CONFIG_EXTRA="
vp3dsp
vp56dsp
vp8dsp
- vt_bt2020
wma_freqs
wmv2dsp
"
@@ -2936,11 +2934,9 @@ libx265_encoder_deps="libx265"
libxavs_encoder_deps="libxavs"
libxvid_encoder_deps="libxvid"
libzvbi_teletext_decoder_deps="libzvbi"
-videotoolbox_deps="VideoToolbox_VideoToolbox_h"
videotoolbox_extralibs="-framework CoreFoundation -framework VideoToolbox
-framework CoreMedia -framework CoreVideo"
videotoolbox_encoder_deps="videotoolbox
VTCompressionSessionPrepareToEncodeFrames"
-videotoolbox_encoder_suggest="vda_framework vt_bt2020"
-vt_bt2020_deps="kCVImageBufferColorPrimaries_ITU_R_2020"
+videotoolbox_encoder_suggest="vda_framework"
# demuxers / muxers
ac3_demuxer_select="ac3_parser"
@@ -5737,9 +5733,7 @@ check_header termios.h
check_header unistd.h
check_header valgrind/valgrind.h
check_header VideoDecodeAcceleration/VDADecoder.h
-check_header VideoToolbox/VideoToolbox.h
check_func_headers VideoToolbox/VTCompressionSession.h
VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox
-enabled videotoolbox && check_func_headers CoreVideo/CVImageBuffer.h
kCVImageBufferColorPrimaries_ITU_R_2020 -framework CoreVideo
check_header windows.h
check_header X11/extensions/XvMClib.h
check_header asm/types.h
@@ -5754,16 +5748,17 @@ check_lib shell32 "windows.h shellapi.h"
CommandLineToArgvW -lshell32
check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom -ladvapi32
check_lib psapi "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
-check_lib coreservices "CoreServices/CoreServices.h" UTGetOSTypeFromString
"-framework CoreServices"
-
enabled audiotoolbox && check_apple_framework AudioToolbox
enabled avfoundation && check_apple_framework AVFoundation
enabled coreimage && check_apple_framework CoreImage
+enabled videotoolbox && check_apple_framework VideoToolbox
enabled avfoundation && {
check_lib avfoundation CoreGraphics/CoreGraphics.h
CGGetActiveDisplayList "-framework CoreGraphics" ||
check_lib avfoundation ApplicationServices/ApplicationServices.h
CGGetActiveDisplayList "-framework ApplicationServices"; }
+enabled videotoolbox &&
+ check_lib coreservices CoreServices/CoreServices.h UTGetOSTypeFromString
"-framework CoreServices"
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
--
2.14.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
