ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sat Apr 8 14:13:43 2017 +0200| [8aaacbf7fd7e06fe81897f5b23d01f8f9ce044e4] | committer: Clément Bœsch
Merge commit 'c21d78a903da378af48c9e5f971fe989592ddb65' * commit 'c21d78a903da378af48c9e5f971fe989592ddb65': configure: Integrate X11 checks into vaapi/vdpau checks Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8aaacbf7fd7e06fe81897f5b23d01f8f9ce044e4 --- configure | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 1bf8674..b702d22 100755 --- a/configure +++ b/configure @@ -2078,7 +2078,6 @@ HAVE_LIST=" vaapi_x11 vdpau_x11 winrt - xlib " # options emitted with CONFIG_ prefix but not available on the command line @@ -6076,18 +6075,16 @@ enabled vaapi && check_lib "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm && enable vaapi_drm +enabled vaapi && + check_lib "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 -lX11 && + enable vaapi_x11 + enabled vdpau && check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" || disable vdpau -enabled_any vaapi vdpau && check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib - -enabled vaapi && enabled xlib && - check_lib "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 && - enable vaapi_x11 - -enabled vdpau && enabled xlib && - check_lib "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau && +enabled vdpau && + check_lib "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11 && enable vdpau_x11 if enabled x86; then ====================================================================== diff --cc configure index 1bf8674,71141c2..b702d22 --- a/configure +++ b/configure @@@ -2077,8 -1680,6 +2077,7 @@@ HAVE_LIST= vaapi_drm vaapi_x11 vdpau_x11 + winrt - xlib " # options emitted with CONFIG_ prefix but not available on the command line @@@ -6080,39 -4817,10 +6083,33 @@@ enabled vdpau & check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" || disable vdpau - enabled_any vaapi vdpau && check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib - - enabled vaapi && enabled xlib && - check_lib "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 && - enable vaapi_x11 - - enabled vdpau && enabled xlib && - check_lib "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau && + enabled vdpau && + check_lib "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11 && enable vdpau_x11 +if enabled x86; then + case $target_os in + mingw32*|mingw64*|win32|win64|linux|cygwin*) + ;; + *) + disable cuda cuvid nvenc + ;; + esac +else + disable cuda cuvid nvenc +fi + +enabled nvenc && + check_cc -I$source_path <<EOF || disable nvenc +#include "compat/nvenc/nvEncodeAPI.h" +NV_ENCODE_API_FUNCTION_LIST flist; +void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_PRESET_HQ_GUID } }; } +int main(void) { return 0; } +EOF + +# Funny iconv installations are not unusual, so check it after all flags have been set +disabled iconv || check_func_headers iconv.h iconv || check_lib iconv.h iconv -liconv || disable iconv + enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" # add some useful compiler flags if supported _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
