gst/gstelement.override (_wrap_gst_element_link): Allow errors parsing the optional filter caps to propagate up.

Original commit message from CVS:
2006-04-07  Andy Wingo  <wingo@pobox.com>

* gst/gstelement.override (_wrap_gst_element_link): Allow errors
parsing the optional filter caps to propagate up.
This commit is contained in:
Andy Wingo 2006-04-07 14:54:49 +00:00
parent 59667a31a7
commit 182840a50d
2 changed files with 9 additions and 1 deletions

View file

@ -1,5 +1,8 @@
2006-04-07 Andy Wingo <wingo@pobox.com>
* gst/gstelement.override (_wrap_gst_element_link): Allow errors
parsing the optional filter caps to propagate up.
* gst/gst.defs (element_make_from_uri): Element name is optional
and can be None. It defaults to None.

View file

@ -179,8 +179,13 @@ _wrap_gst_element_link(PyGObject *self, PyObject *args, PyObject *kwargs)
return NULL;
if (py_caps == NULL)
caps = NULL;
else
else {
caps = pygst_caps_from_pyobject (py_caps, &caps_is_copy);
if (caps == NULL)
/* an error happened, propagate up */
return NULL;
}
ret = gst_element_link_filtered(GST_ELEMENT(self->obj), GST_ELEMENT(dest->obj), caps);
if (caps && caps_is_copy)
gst_caps_unref (caps);