changeset
merge of '7ed64195754dc3d01b95e1419bd11694f81c5a4f'
Wed, 22 Jul 2009 03:15:48 +0000
- author
- Michael Ruprecht <maiku@pidgin.im>
- date
- Wed, 22 Jul 2009 03:15:48 +0000
- changeset 27929
- a96e1707a834
- parent 27926
- 7ed64195754d (diff)
- parent 27928
- 7c38fd0e3b45 (current diff)
- child 27930
- e87040997839
merge of '7ed64195754dc3d01b95e1419bd11694f81c5a4f'
and '7c38fd0e3b4548abdd628c55c5bd778a1698d742'
--- a/libpurple/mediamanager.c Wed Jul 22 02:36:28 2009 +0000 +++ b/libpurple/mediamanager.c Wed Jul 22 03:15:48 2009 +0000 @@ -780,7 +780,8 @@ pad = gst_element_get_static_pad(queue, "sink"); peer = gst_pad_get_peer(pad); gst_object_unref(pad); - gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer); + if (peer != NULL) + gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer); gst_element_set_locked_state(queue, TRUE); gst_element_set_state(queue, GST_STATE_NULL); gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);
