diff --git a/app/app.pro b/app/app.pro index 469aa11c..ecf55183 100644 --- a/app/app.pro +++ b/app/app.pro @@ -44,7 +44,6 @@ macx { unix:!macx { CONFIG += link_pkgconfig PKGCONFIG += openssl sdl2 opus - LIBS += -ldl packagesExist(libavcodec) { PKGCONFIG += libavcodec libavutil diff --git a/app/streaming/video/ffmpeg-renderers/vaapi.cpp b/app/streaming/video/ffmpeg-renderers/vaapi.cpp index 38d9aa71..aa2aaa10 100644 --- a/app/streaming/video/ffmpeg-renderers/vaapi.cpp +++ b/app/streaming/video/ffmpeg-renderers/vaapi.cpp @@ -1,8 +1,6 @@ #include "vaapi.h" #include -#include - #include VAAPIRenderer::VAAPIRenderer() diff --git a/app/streaming/video/ffmpeg-renderers/vaapi.h b/app/streaming/video/ffmpeg-renderers/vaapi.h index 18552ae7..532b78db 100644 --- a/app/streaming/video/ffmpeg-renderers/vaapi.h +++ b/app/streaming/video/ffmpeg-renderers/vaapi.h @@ -2,6 +2,18 @@ #include "renderer.h" +// Avoid X11 if SDL was built without it +#ifndef SDL_VIDEO_DRIVER_X11 +#warning Unable to use libva-x11 without SDL support +#undef HAVE_LIBVA_X11 +#endif + +// Avoid Wayland if SDL was built without it +#ifndef SDL_VIDEO_DRIVER_WAYLAND +#warning Unable to use libva-wayland without SDL support +#undef HAVE_LIBVA_WAYLAND +#endif + extern "C" { #include #ifdef HAVE_LIBVA_X11