summaryrefslogtreecommitdiff
path: root/ext/gl/gstglvideomixer.c
diff options
context:
space:
mode:
authorJulien Isorce <jisorce@oblong.com>2017-07-07 16:15:12 +0100
committerJulien Isorce <jisorce@oblong.com>2017-08-22 10:00:19 +0100
commit3573238683a8ad1960a1e10c3400210a7c6cbc60 (patch)
tree184ea2b6b469880fce2dbad6d46b2146a9ce50ea /ext/gl/gstglvideomixer.c
parent5322026885606ae1f7cee0fe99d1636c1e49500d (diff)
gl: do not include GL headers in public gstgl headers
Except for gst/gl/gstglfuncs.h It is up to the client app to include these headers. It is coherent with the fact that gstreamer-gl.pc does not require any egl.pc/gles.pc. I.e. it is the responsability of the app to search these headers within its build setup. For example gstreamer-vaapi includes explicitly EGL/egl.h and search for it in its configure.ac. For example with this patch, if an app includes the headers gst/gl/egl/gstglcontext_egl.h gst/gl/egl/gstgldisplay_egl.h gst/gl/egl/gstglmemoryegl.h it will *no longer* automatically include EGL/egl.h and GLES2/gl2.h. Which is good because the app might want to use the gstgl api only without the need to bother about gl headers. Also added a test: cd tests/check && make libs/gstglheaders.check https://bugzilla.gnome.org/show_bug.cgi?id=784779
Diffstat (limited to 'ext/gl/gstglvideomixer.c')
-rw-r--r--ext/gl/gstglvideomixer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c
index a5a094b67..7180220de 100644
--- a/ext/gl/gstglvideomixer.c
+++ b/ext/gl/gstglvideomixer.c
@@ -43,10 +43,12 @@
#include "config.h"
#endif
-#include <gst/video/gstvideoaffinetransformationmeta.h>
#include <gst/controller/gstproxycontrolbinding.h>
+#include <gst/gl/gstglfuncs.h>
+#include <gst/video/gstvideoaffinetransformationmeta.h>
#include "gstglvideomixer.h"
+
#include "gstglmixerbin.h"
#include "gstglutils.h"