diff options
| author | Antoni Silvestre <antoni.silvestre@gmail.com> | 2011-11-18 17:26:35 +0100 |
|---|---|---|
| committer | Matthew Waters <ystreet00@gmail.com> | 2014-03-15 18:36:42 +0100 |
| commit | b640cbc542fea2f8e8f62f778664002dab27823b (patch) | |
| tree | dc0539827a14965c1858f92780ab14eaa5bc96f6 /gst-libs/gst/gl/gstglfilter.h | |
| parent | cc70130c6f2d84f59297b12de3c33ce58dd155be (diff) | |
| download | gstreamer-plugins-bad-b640cbc542fea2f8e8f62f778664002dab27823b.tar.gz | |
[476/906] OpenGL ES 2.0: fix build and disable some examples
Fix bug #631019
Diffstat (limited to 'gst-libs/gst/gl/gstglfilter.h')
| -rw-r--r-- | gst-libs/gst/gl/gstglfilter.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gst-libs/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h index f97c91d72..41bdc70a1 100644 --- a/gst-libs/gst/gl/gstglfilter.h +++ b/gst-libs/gst/gl/gstglfilter.h @@ -1,4 +1,4 @@ -/* +/* * GStreamer * Copyright (C) 2007 David Schleef <ds@schleef.org> * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com> @@ -41,7 +41,7 @@ typedef struct _GstGLFilter GstGLFilter; typedef struct _GstGLFilterClass GstGLFilterClass; -typedef gboolean (*GstGLFilterSetCaps) (GstGLFilter* filter, +typedef gboolean (*GstGLFilterSetCaps) (GstGLFilter* filter, GstCaps* incaps, GstCaps* outcaps); typedef gboolean (*GstGLFilterProcessFunc) (GstGLFilter *filter, GstGLBuffer *inbuf, GstGLBuffer *outbuf); @@ -75,7 +75,7 @@ struct _GstGLFilterClass GstGLFilterSetCaps set_caps; GstGLFilterProcessFunc filter; GstGLFilterOnInitFBO onInitFBO; - + GstGLFilterOnStart onStart; GstGLFilterOnStop onStop; GstGLFilterOnReset onReset; @@ -89,14 +89,16 @@ GType gst_gl_filter_get_type(void); void -gst_gl_filter_render_to_target (GstGLFilter *filter, +gst_gl_filter_render_to_target (GstGLFilter *filter, GLuint input, GLuint target, GLCB func, gpointer data); +#ifndef OPENGL_ES2 void gst_gl_filter_render_to_target_with_shader (GstGLFilter * filter, GLuint input, GLuint target, GstGLShader *shader); void gst_gl_filter_draw_texture (GstGLFilter *filter, GLuint texture); +#endif G_END_DECLS |