diff options
author | Matthew Waters <ystreet00@gmail.com> | 2014-06-25 18:23:52 +1000 |
---|---|---|
committer | Matthew Waters <ystreet00@gmail.com> | 2014-06-25 18:26:13 +1000 |
commit | 7797b15de75c815c0a95a8892779485607622b7c (patch) | |
tree | 9943826df72cd7d5f8b7f16014ce34793b3e0320 /ext/gl/gstopengl.c | |
parent | 13023f297507cf503e758271ce0797e22e5f92ae (diff) | |
download | gstreamer-plugins-bad-7797b15de75c815c0a95a8892779485607622b7c.tar.gz |
glshader: enable glshader on GLES2
Diffstat (limited to 'ext/gl/gstopengl.c')
-rw-r--r-- | ext/gl/gstopengl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c index fbe5b277c..a4b254051 100644 --- a/ext/gl/gstopengl.c +++ b/ext/gl/gstopengl.c @@ -49,6 +49,7 @@ #include "gstgleffects.h" #include "gstglcolorscale.h" #include "gstglvideomixer.h" +#include "gstglfiltershader.h" #if HAVE_GRAPHENE #include "gstgltransformation.h" #endif @@ -60,7 +61,6 @@ #include "gstglfilterapp.h" #include "gstglfilterblur.h" #include "gstglfilterreflectedscreen.h" -#include "gstglfiltershader.h" #include "gstglfiltersobel.h" #include "gstgldeinterlace.h" #include "gstglmosaic.h" @@ -129,6 +129,10 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_GL_VIDEO_MIXER)) { return FALSE; } + if (!gst_element_register (plugin, "glshader", + GST_RANK_NONE, gst_gl_filtershader_get_type ())) { + return FALSE; + } #if GST_GL_HAVE_OPENGL if (!gst_element_register (plugin, "gltestsrc", GST_RANK_NONE, GST_TYPE_GL_TEST_SRC)) { @@ -140,11 +144,6 @@ plugin_init (GstPlugin * plugin) return FALSE; } - if (!gst_element_register (plugin, "glshader", - GST_RANK_NONE, gst_gl_filtershader_get_type ())) { - return FALSE; - } - if (!gst_element_register (plugin, "glfiltersobel", GST_RANK_NONE, gst_gl_filtersobel_get_type ())) { return FALSE; |