ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sat May 20 16:28:43 2017 +0200| [d1da0fc4b9b3bcd146b429c79511181ca66a152a] | committer: Clément Bœsch
Merge commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4' * commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4': build: Detect blocks C language extension and add it as VDA dependency Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1da0fc4b9b3bcd146b429c79511181ca66a152a --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index db5cdf2ef0..de290b199b 100755 --- a/configure +++ b/configure @@ -2004,6 +2004,7 @@ TOOLCHAIN_FEATURES=" asm_mod_q attribute_may_alias attribute_packed + blocks_extension ebp_available ebx_available gnu_as @@ -2599,7 +2600,7 @@ d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext" dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode" dxva2_extralibs="-luser32" dxva2_lib_deps="dxva2" -vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h" +vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h blocks_extension" vda_framework_extralibs="-framework VideoDecodeAcceleration" vda_deps="vda_framework pthreads" vda_extralibs="-framework CoreFoundation -framework QuartzCore" @@ -6176,6 +6177,10 @@ check_disable_warning_headers(){ check_disable_warning_headers -Wno-deprecated-declarations check_disable_warning_headers -Wno-unused-variable +check_cc <<EOF && enable blocks_extension +void (^block)(void); +EOF + # add some linker flags check_ldflags -Wl,--warn-common check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample ====================================================================== diff --cc configure index db5cdf2ef0,04b19211cf..de290b199b --- a/configure +++ b/configure @@@ -2579,33 -2127,18 +2580,33 @@@ wmv2_decoder_select="blockdsp error_res wmv2_encoder_select="h263_encoder wmv2dsp" wmv3_decoder_select="vc1_decoder" wmv3image_decoder_select="wmv3_decoder" -zerocodec_decoder_deps="zlib" -zlib_decoder_deps="zlib" -zlib_encoder_deps="zlib" -zmbv_decoder_deps="zlib" -zmbv_encoder_deps="zlib" +xma1_decoder_select="wmapro_decoder" +xma2_decoder_select="wmapro_decoder" +zerocodec_decoder_select="zlib" +zlib_decoder_select="zlib" +zlib_encoder_select="zlib" +zmbv_decoder_select="zlib" +zmbv_encoder_select="zlib" + +# platform codecs +audiotoolbox_deps="AudioToolbox_AudioToolbox_h" +audiotoolbox_extralibs="-framework CoreFoundation -framework AudioToolbox -framework CoreMedia" # hardware accelerators -d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder" +crystalhd_deps="libcrystalhd_libcrystalhd_if_h" +cuda_deps_any="dlopen LoadLibrary" +cuvid_deps="cuda" +d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext" dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode" +dxva2_extralibs="-luser32" dxva2_lib_deps="dxva2" - vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h" -vda_deps="VideoDecodeAcceleration_VDADecoder_h blocks_extension pthreads" -vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" ++vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h blocks_extension" +vda_framework_extralibs="-framework VideoDecodeAcceleration" +vda_deps="vda_framework pthreads" +vda_extralibs="-framework CoreFoundation -framework QuartzCore" +videotoolbox_hwaccel_deps="videotoolbox pthreads" +videotoolbox_hwaccel_extralibs="-framework QuartzCore" +xvmc_deps="X11_extensions_XvMClib_h" h263_vaapi_hwaccel_deps="vaapi" h263_vaapi_hwaccel_select="h263_decoder" @@@ -6176,11 -4849,16 +6177,15 @@@ check_disable_warning_headers() check_disable_warning_headers -Wno-deprecated-declarations check_disable_warning_headers -Wno-unused-variable -check_objcflags -fobjc-arc && enable objc_arc - + check_cc <<EOF && enable blocks_extension + void (^block)(void); + EOF + # add some linker flags check_ldflags -Wl,--warn-common -check_ldflags -Wl,-rpath-link=libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample +check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample enabled rpath && add_ldexeflags -Wl,-rpath,$libdir +enabled rpath && add_ldlibflags -Wl,-rpath,$libdir test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic # add some strip flags _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
