gl/sink: make sure we always initialize the upload object

https://bugzilla.gnome.org/show_bug.cgi?id=729542
This commit is contained in:
Matthew Waters 2014-05-07 09:11:25 +10:00 committed by Tim-Philipp Müller
parent d7c5444447
commit a865a931fc

View file

@ -687,9 +687,21 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
gst_object_unref (oldpool); gst_object_unref (oldpool);
} }
if (glimage_sink->upload)
gst_object_unref (glimage_sink->upload);
glimage_sink->upload = gst_object_ref (GST_GL_BUFFER_POOL (newpool)->upload); glimage_sink->upload = gst_object_ref (GST_GL_BUFFER_POOL (newpool)->upload);
if (!gst_gl_upload_init_format (glimage_sink->upload, &vinfo))
goto upload_error;
return TRUE; return TRUE;
upload_error:
{
GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
("%s", "Failed to initialize upload resources"), (NULL));
return FALSE;
}
} }
static GstFlowReturn static GstFlowReturn