Skip to content

F
ffmpeg
Commit c21d78a9 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

configure: Integrate X11 checks into vaapi/vdpau checks

parent 8b56dbe7
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
configure
View file @ c21d78a9
...@@ -1680,7 +1680,6 @@ HAVE_LIST=" ...@@ -1680,7 +1680,6 @@ HAVE_LIST="
vaapi_drm vaapi_drm
vaapi_x11 vaapi_x11
vdpau_x11 vdpau_x11
xlib
" "
# options emitted with CONFIG_ prefix but not available on the command line # options emitted with CONFIG_ prefix but not available on the command line
...@@ -4810,18 +4809,16 @@ enabled vaapi && ...@@ -4810,18 +4809,16 @@ enabled vaapi &&
check_lib "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm && check_lib "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm &&
enable vaapi_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 && enabled vdpau &&
check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" || check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
disable vdpau disable vdpau
enabled_any vaapi vdpau && check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib enabled vdpau &&
check_lib "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11 &&
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 enable vdpau_x11
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment