From 57a0c3d56dc4d975e95bfb805e12bacaee2527f1 Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Fri, 10 Nov 2023 11:29:45 +0100 Subject: Fix build with vaapi versions < 1.9.0 The function vaSyncBuffer was introduced in 1.9.0. Task-number: QTBUG-118510 Pick-to: 6.5 Change-Id: Icebabc981de1fa5e1738d092479686221da07987 Reviewed-by: Lars Knoll (cherry picked from commit f24e2a4d7f2b13f5b79367c729de87df9459ff3b) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp b/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp index ec212f5a3..58bf4dce7 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp @@ -37,7 +37,10 @@ static Libs loadLibs() return {}; } -constexpr size_t symbolsCount = 39 +constexpr size_t symbolsCount = 38 +#if VA_CHECK_VERSION(1, 9, 0) + + 1 +#endif #ifdef DYNAMIC_RESOLVE_VA_DRM_SYMBOLS + 1 #endif @@ -79,7 +82,9 @@ DEFINE_FUNC(vaEndPicture, 2, VA_STATUS_ERROR_OPERATION_FAILED); DEFINE_FUNC(vaCreateBuffer, 7, VA_STATUS_ERROR_OPERATION_FAILED); DEFINE_FUNC(vaMapBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED); DEFINE_FUNC(vaUnmapBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED); +#if VA_CHECK_VERSION(1, 9, 0) DEFINE_FUNC(vaSyncBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED); +#endif DEFINE_FUNC(vaDestroyBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED); DEFINE_FUNC(vaCreateSurfaces, 8, VA_STATUS_ERROR_OPERATION_FAILED); -- cgit v1.2.3