mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
Merge commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43'
* commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43': configure: Do not unconditionally check for (and enable) xlib Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
f0df60d392
16
configure
vendored
16
configure
vendored
@ -6026,9 +6026,6 @@ if enabled libcdio; then
|
||||
die "ERROR: No usable libcdio/cdparanoia found"
|
||||
fi
|
||||
|
||||
enabled xlib &&
|
||||
check_lib X11/Xlib.h XOpenDisplay -lX11 || disable xlib
|
||||
|
||||
if ! disabled libxcb; then
|
||||
check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || {
|
||||
enabled libxcb && die "ERROR: libxcb >= 1.4 not found";
|
||||
@ -6075,19 +6072,20 @@ enabled vaapi &&
|
||||
check_code cc "va/va.h" "vaCreateSurfaces(0, 0, 0, 0, 0, 0, 0, 0)" ||
|
||||
disable vaapi
|
||||
|
||||
if enabled vaapi ; then
|
||||
enabled xlib &&
|
||||
check_lib "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 &&
|
||||
enable vaapi_x11
|
||||
|
||||
enabled vaapi &&
|
||||
check_lib "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm &&
|
||||
enable vaapi_drm
|
||||
fi
|
||||
|
||||
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 &&
|
||||
enable vdpau_x11
|
||||
|
Loading…
x
Reference in New Issue
Block a user