From b8e06e7311dd923a33770ea4615862b8815ac657 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Thu, 10 Dec 2015 12:41:00 +1100 Subject: [PATCH] glbufferpool: relax check for multiple texture targets Only complain about multiple texture targets when _different_ texture targets are configured. --- gst-libs/gst/gl/gstglbufferpool.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/gl/gstglbufferpool.c b/gst-libs/gst/gl/gstglbufferpool.c index 784964f149..cc37e41cc4 100644 --- a/gst-libs/gst/gl/gstglbufferpool.c +++ b/gst-libs/gst/gl/gstglbufferpool.c @@ -206,19 +206,21 @@ gst_gl_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) if (gst_buffer_pool_config_has_option (config, GST_BUFFER_POOL_OPTION_GL_TEXTURE_TARGET_2D)) { - if (priv->tex_target) + if (priv->tex_target && priv->tex_target != GST_GL_TEXTURE_TARGET_2D) multiple_texture_targets = TRUE; priv->tex_target = GST_GL_TEXTURE_TARGET_2D; } if (gst_buffer_pool_config_has_option (config, GST_BUFFER_POOL_OPTION_GL_TEXTURE_TARGET_RECTANGLE)) { - if (priv->tex_target) + if (priv->tex_target + && priv->tex_target != GST_GL_TEXTURE_TARGET_RECTANGLE) multiple_texture_targets = TRUE; priv->tex_target = GST_GL_TEXTURE_TARGET_RECTANGLE; } if (gst_buffer_pool_config_has_option (config, GST_BUFFER_POOL_OPTION_GL_TEXTURE_TARGET_EXTERNAL_OES)) { - if (priv->tex_target) + if (priv->tex_target + && priv->tex_target != GST_GL_TEXTURE_TARGET_EXTERNAL_OES) multiple_texture_targets = TRUE; priv->tex_target = GST_GL_TEXTURE_TARGET_EXTERNAL_OES; }