[vlc-commits] vout: gl: always include gl2ext.h after gl2.h

[Victorien Le Couviour--Tuffet]

vlc | branch: master | Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet at gmail.com> | Tue Sep 11 19:17:35 2018 +0200| [b0d41f45f8006ba80578b51071c09dc81cdca1e2] | committer: Thomas Guillem

vout: gl: always include gl2ext.h after gl2.h

Fixes android NDK 17 build

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0d41f45f8006ba80578b51071c09dc81cdca1e2
---

 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 229f2bd20b..e75a733c67 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 2e89544b24..92ddd291fc 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 8ff9af0623..a0dfca329d 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;