diff options
| author | Jan Schmidt <jan@centricular.com> | 2016-08-25 15:26:49 +1000 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2016-08-26 03:25:49 +1000 |
| commit | 45df74868ce154dac0631c1f2d25e54c05c65b13 (patch) | |
| tree | ba2e35a35ecd3460c58b729296060445750d6cef /gst-libs | |
| parent | 4f6ae1f48c2a139faf07958b9e2232da8dde1b83 (diff) | |
| download | gstreamer-plugins-bad-45df74868ce154dac0631c1f2d25e54c05c65b13.tar.gz | |
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.
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/gl/gstglviewconvert.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gst-libs/gst/gl/gstglviewconvert.c b/gst-libs/gst/gl/gstglviewconvert.c index 54c0ca61c..c409e3a66 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 |