On Tue, May 26, 2015 at 2:04 PM, Luca Barbato <[email protected]> wrote: > On 26/05/15 13:41, Steve Lhomme wrote: >> On Tue, May 26, 2015 at 1:24 PM, Luca Barbato <[email protected]> wrote: >>> On 26/05/15 08:45, Steve Lhomme wrote: >>>> Fixes build with "mingw-w64-x86-64-dev 3.2.0-2" >>>> >>>> Tested-by: jamrial >>>> Signed-off-by: Michael Niedermayer <[email protected]> >>>> --- >>>> configure | 4 +++- >>>> 1 file changed, 3 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/configure b/configure >>>> index a9ecad1..00fe508 100755 >>>> --- a/configure >>>> +++ b/configure >>>> @@ -1523,6 +1523,7 @@ TOOLCHAIN_FEATURES=" >>>> TYPES_LIST=" >>>> CONDITION_VARIABLE_Ptr >>>> DXVA_PicParams_HEVC >>>> + ID3D11VideoDecoder >>>> socklen_t >>>> struct_addrinfo >>>> struct_group_source_req >>>> @@ -1969,7 +1970,7 @@ zmbv_decoder_deps="zlib" >>>> zmbv_encoder_deps="zlib" >>>> >>>> # hardware accelerators >>>> -d3d11va_deps="d3d11_h dxva_h" >>>> +d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder" >>>> dxva2_deps="dxva2api_h" >>>> vaapi_deps="va_va_h" >>>> vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" >>>> @@ -4197,6 +4198,7 @@ check_lib2 "windows.h psapi.h" GetProcessMemoryInfo >>>> -lpsapi >>>> check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss >>>> >>>> check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" >>>> +check_type "windows.h d3d11.h" "ID3D11VideoDecoder" >>>> >>>> if ! disabled w32threads && ! enabled pthreads; then >>>> check_func_headers "windows.h process.h" _beginthreadex && >>>> >>> >>> You should just depend on ID3D11VideoDecoder. >> >> d3d11va_deps="ID3D11VideoDecoder" ? >> >> We need at least dxva_h because it's included too and not necessarily >> there (on a terribly setup system). > > ID3D11VideoDecoder does imply d3d11_h. > > Probably > > check_type "windows.h dxva.h d3d11.h" "ID3D11VideoDecoder" > > Should simplify a little everything. >
dxva_h is checked for anyway because the dxva2 decoder needs it, so adding it here and removing the dep later serves really no purpose. - Hendrik _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
