ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Sat Apr 15 18:38:45 2017 +0200| [3390a2be9deb1ce2bb10163106f1ba8e4ea8ad04] | committer: Clément Bœsch
Merge commit 'af451ac0de6776e97d6a3ff95eac257b7964002e' * commit 'af451ac0de6776e97d6a3ff95eac257b7964002e': configure: Drop redundant and partly bogus vaapi/vdpau header checks Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3390a2be9deb1ce2bb10163106f1ba8e4ea8ad04 --- configure | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure b/configure index 3f2811a5b3..e6fe05a6ee 100755 --- a/configure +++ b/configure @@ -2596,12 +2596,10 @@ cuvid_deps="cuda" d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext" dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode" dxva2_extralibs="-luser32" -vaapi_deps="va_va_h" vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h" vda_framework_extralibs="-framework VideoDecodeAcceleration" vda_deps="vda_framework pthreads" vda_extralibs="-framework CoreFoundation -framework QuartzCore" -vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" videotoolbox_hwaccel_deps="videotoolbox pthreads" videotoolbox_hwaccel_extralibs="-framework QuartzCore" xvmc_deps="X11_extensions_XvMClib_h" @@ -5644,8 +5642,6 @@ check_header sys/un.h check_header termios.h check_header unistd.h check_header valgrind/valgrind.h -check_header vdpau/vdpau.h -check_header vdpau/vdpau_x11.h check_header VideoDecodeAcceleration/VDADecoder.h check_header VideoToolbox/VideoToolbox.h check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox ====================================================================== diff --cc configure index 3f2811a5b3,fc2c54aad3..e6fe05a6ee --- a/configure +++ b/configure @@@ -2577,34 -2119,17 +2577,32 @@@ 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" -vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" -vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" +dxva2_extralibs="-luser32" - vaapi_deps="va_va_h" +vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h" +vda_framework_extralibs="-framework VideoDecodeAcceleration" +vda_deps="vda_framework pthreads" +vda_extralibs="-framework CoreFoundation -framework QuartzCore" - vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +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" @@@ -5641,18 -4543,11 +5639,16 @@@ check_header sys/resource. check_header sys/select.h check_header sys/time.h check_header sys/un.h +check_header termios.h check_header unistd.h check_header valgrind/valgrind.h - check_header vdpau/vdpau.h - check_header vdpau/vdpau_x11.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 # it seems there are versions of clang in some distros that try to use the # gcc headers, which explodes for stdatomic _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
