summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhong Li <zhong.li@intel.com>2019-03-20 14:51:12 +0800
committerZhong Li <zhong.li@intel.com>2019-03-28 21:47:15 +0800
commit81ae387a265de856b63dc953c4195904360b7e98 (patch)
treeb0696b554f146fe28e59a8a9dc074c976055ccf8
parentf8fa8bbf225fa94f73d739d38b70d0c2227d61d6 (diff)
configure: include pkgconfig path as vaapi header search
Currectly just standard header path can be found, check_type/struct will fail if vaapi is installed somewhere else. Move them followed "check_pkg_config" Reviewed-by: Mark Thompson <sw@jkqxz.net> Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org> Signed-off-by: Zhong Li <zhong.li@intel.com>
-rwxr-xr-xconfigure16
1 files changed, 8 insertions, 8 deletions
diff --git a/configure b/configure
index c94f516224..f6123f53e5 100755
--- a/configure
+++ b/configure
@@ -6022,14 +6022,6 @@ check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
check_type "windows.h d3d11.h" "ID3D11VideoContext"
check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
-check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
-check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
-check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags
-check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
-check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
-check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8"
-check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9"
-
check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"
if enabled cuda_sdk; then
@@ -6461,6 +6453,14 @@ if enabled vaapi; then
fi
check_cpp_condition vaapi_1 "va/va.h" "VA_CHECK_VERSION(1, 0, 0)"
+
+ check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
+ check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
+ check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags
+ check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
+ check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
+ check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8"
+ check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9"
fi
if enabled_all opencl libdrm ; then