RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: Detect blocks C language extension and add it as VDA dependency 

Newer versions of OS X use the blocks extension in VDA-related headers.
Some compilers, like current gcc, do not support the blocks extension
and fail to compile code using those headers.
This commit is contained in:
Diego Biurrun 2017-01-25 18:40:51 +01:00
parent f96d07f4ec
commit 6151e9128c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -1639,6 +1639,7 @@ TOOLCHAIN_FEATURES="
asm_mod_q asm_mod_q
attribute_may_alias attribute_may_alias
attribute_packed attribute_packed
blocks_extension
ebp_available ebp_available
ebx_available ebx_available
gnu_as gnu_as
@ -2136,7 +2137,7 @@ zmbv_encoder_deps="zlib"
d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder" d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode" dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"
dxva2_lib_deps="dxva2" dxva2_lib_deps="dxva2"
vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" vda_deps="VideoDecodeAcceleration_VDADecoder_h blocks_extension pthreads"
vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
h263_vaapi_hwaccel_deps="vaapi" h263_vaapi_hwaccel_deps="vaapi"
@ -4850,6 +4851,10 @@ check_disable_warning_headers -Wno-unused-variable
check_objcflags -fobjc-arc && enable objc_arc check_objcflags -fobjc-arc && enable objc_arc
check_cc <<EOF && enable blocks_extension
void (^block)(void);
EOF
# add some linker flags # add some linker flags
check_ldflags -Wl,--warn-common check_ldflags -Wl,--warn-common
check_ldflags -Wl,-rpath-link=libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample check_ldflags -Wl,-rpath-link=libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample