From 4bbe571f5fb85ed2d4ab6c07717da4aba4bdb5cf Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 16 May 2020 13:25:10 -0700 Subject: [PATCH] Fix build without FFmpeg and with older EGL 1.5 headers --- app/streaming/video/ffmpeg-renderers/eglvid.cpp | 3 +++ config.tests/EGL/EGL.pro | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/streaming/video/ffmpeg-renderers/eglvid.cpp b/app/streaming/video/ffmpeg-renderers/eglvid.cpp index 80160010..c2af3ed4 100644 --- a/app/streaming/video/ffmpeg-renderers/eglvid.cpp +++ b/app/streaming/video/ffmpeg-renderers/eglvid.cpp @@ -17,6 +17,9 @@ #ifndef EGL_VERSION_1_5 typedef intptr_t EGLAttrib; +#endif + +#if !defined(EGL_VERSION_1_5) || !defined(EGL_EGL_PROTOTYPES) typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void *native_display, const EGLAttrib *attrib_list); #endif diff --git a/config.tests/EGL/EGL.pro b/config.tests/EGL/EGL.pro index 9dc0f354..55a22daf 100644 --- a/config.tests/EGL/EGL.pro +++ b/config.tests/EGL/EGL.pro @@ -10,4 +10,4 @@ packagesExist(mmal) { PKGCONFIG += mmal } -PKGCONFIG += sdl2 egl \ No newline at end of file +PKGCONFIG += sdl2 egl libavcodec libavutil \ No newline at end of file