diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-11-23 12:15:00 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-11-29 19:14:07 +0100 |
| commit | c21d78a903da378af48c9e5f971fe989592ddb65 (patch) | |
| tree | 605faa4371c7d5696bd5793bdabbe27f205b2b32 /configure | |
| parent | 8b56dbe7435d8cfe3964f447fc45fe98db5d9042 (diff) | |
| download | ffmpeg-c21d78a903da378af48c9e5f971fe989592ddb65.tar.gz | |
configure: Integrate X11 checks into vaapi/vdpau checks
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -1680,7 +1680,6 @@ HAVE_LIST=" vaapi_drm vaapi_x11 vdpau_x11 - xlib " # options emitted with CONFIG_ prefix but not available on the command line @@ -4810,18 +4809,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 enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" |