diff --git a/gst-libs/gst/gl/gstglbufferpool.c b/gst-libs/gst/gl/gstglbufferpool.c index 9ace4041d8..25f2548463 100644 --- a/gst-libs/gst/gl/gstglbufferpool.c +++ b/gst-libs/gst/gl/gstglbufferpool.c @@ -48,8 +48,7 @@ G_DEFINE_TYPE (GstGLBufferPool, gst_gl_buffer_pool, GST_TYPE_BUFFER_POOL); static const gchar ** gst_gl_buffer_pool_get_options (GstBufferPool * pool) { - static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, - GST_BUFFER_POOL_OPTION_GL_META, NULL + static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, NULL }; return options; @@ -98,8 +97,6 @@ gst_gl_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) priv->info = info; priv->add_videometa = gst_buffer_pool_config_has_option (config, - GST_BUFFER_POOL_OPTION_GL_META) || - gst_buffer_pool_config_has_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META); return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config); @@ -159,7 +156,7 @@ gst_gl_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer, if (priv->add_videometa) { GST_DEBUG_OBJECT (pool, "adding GstGLMeta"); /* these are just the defaults for now */ - gst_buffer_add_video_meta (buf, glpool->display, 0, + gst_buffer_add_video_meta (buf, 0, GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info)); } diff --git a/gst-libs/gst/gl/gstglbufferpool.h b/gst-libs/gst/gl/gstglbufferpool.h index 24e287687b..071def8661 100644 --- a/gst-libs/gst/gl/gstglbufferpool.h +++ b/gst-libs/gst/gl/gstglbufferpool.h @@ -26,19 +26,10 @@ #include #include "gstgldisplay.h" -#include "gstglmeta.h" #include "gstglmemory.h" G_BEGIN_DECLS -/** - * GST_BUFFER_POOL_OPTION_VIDEO_META: - * - * An option that can be activated on bufferpool to request OpenGL metadata - * on buffers from the pool. - */ -#define GST_BUFFER_POOL_OPTION_GL_META "GstBufferPoolOptionGLMeta" - typedef struct _GstGLBufferPool GstGLBufferPool; typedef struct _GstGLBufferPoolClass GstGLBufferPoolClass; typedef struct _GstGLBufferPoolPrivate GstGLBufferPoolPrivate;