From 179f7c00fe6de64d376266106e9806b065ef39cd Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 25 Aug 2016 15:26:49 +1000 Subject: [PATCH] glviewconvert: Fix texture target fixation Don't set the chosen texture-target into the wrong structure. The input caps may not be writable, and in any case - the intention was to configure the othercaps. Also, remove an extra unref - the othercaps ref is consumed by gst_caps_make_writable already. --- gst-libs/gst/gl/gstglviewconvert.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/gl/gstglviewconvert.c b/gst-libs/gst/gl/gstglviewconvert.c index 54c0ca6..c409e3a 100644 --- a/gst-libs/gst/gl/gstglviewconvert.c +++ b/gst-libs/gst/gl/gstglviewconvert.c @@ -1208,7 +1208,7 @@ _fixate_texture_target (GstGLViewConvert * viewconvert, g_value_set_static_string (&item, GST_GL_TEXTURE_TARGET_EXTERNAL_OES_STR); } - gst_structure_set_value (s, "texture-target", &item); + gst_structure_set_value (s_other, "texture-target", &item); g_value_unset (&item); @@ -1286,9 +1286,7 @@ gst_gl_view_convert_fixate_caps (GstGLViewConvert * viewconvert, } } - tmp = _fixate_texture_target (viewconvert, direction, caps, othercaps); - gst_caps_unref (othercaps); - othercaps = tmp; + othercaps = _fixate_texture_target (viewconvert, direction, caps, othercaps); done: GST_DEBUG_OBJECT (viewconvert, "dir %s fixated to %" GST_PTR_FORMAT -- 2.7.4