vlc/vlc-3.0 | branch: master | Victorien Le Couviour--Tuffet <[email protected]> | Tue Sep 11 19:17:35 2018 +0200| [436a1043ee4f078b22de7f7117fed84e8d6578a4] | committer: Thomas Guillem
vout: gl: always include gl2ext.h after gl2.h Fixes android ndk17 build (cherry picked from commit b0d41f45f8006ba80578b51071c09dc81cdca1e2) Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=436a1043ee4f078b22de7f7117fed84e8d6578a4 --- modules/video_output/opengl/converter.h | 1 + modules/video_output/opengl/converter_android.c | 1 - modules/video_output/opengl/converter_vaapi.c | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h index 02b2f11bd4..c4b898f583 100644 --- a/modules/video_output/opengl/converter.h +++ b/modules/video_output/opengl/converter.h @@ -43,6 +43,7 @@ #else /* !defined (__APPLE__) */ # if defined (USE_OPENGL_ES2) # include <GLES2/gl2.h> +# include <GLES2/gl2ext.h> # else # ifdef _WIN32 # include <GL/glew.h> diff --git a/modules/video_output/opengl/converter_android.c b/modules/video_output/opengl/converter_android.c index 6eb21a4633..ea60b92c42 100644 --- a/modules/video_output/opengl/converter_android.c +++ b/modules/video_output/opengl/converter_android.c @@ -26,7 +26,6 @@ # error this file must be built from android #endif -#include <GLES2/gl2ext.h> #include "converter.h" #include "../android/display.h" #include "../android/utils.h" diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c index 635819d9f9..8b2d2acbfc 100644 --- a/modules/video_output/opengl/converter_vaapi.c +++ b/modules/video_output/opengl/converter_vaapi.c @@ -47,10 +47,6 @@ # include <fcntl.h> #endif -#if defined(USE_OPENGL_ES2) -# include <GLES2/gl2ext.h> -#endif - struct priv { struct vlc_vaapi_instance *vainst; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
