summaryrefslogtreecommitdiff
authorYouness Alaoui <youness.alaoui@collabora.co.uk>2010-08-26 02:56:03 (GMT)
committer Sebastian Dröge <sebastian.droege@collabora.co.uk>2010-08-30 13:15:50 (GMT)
commit5cc57a82f079d50a5f6daa8601e44fea3e7631eb (patch) (side-by-side diff)
tree5269137b2676b4cad2913046f5e08385265a568b
parentdab76bc68ef49d0a4c77809f049d90def8aee083 (diff)
downloadgst-plugins-bad-5cc57a82f079d50a5f6daa8601e44fea3e7631eb.zip
gst-plugins-bad-5cc57a82f079d50a5f6daa8601e44fea3e7631eb.tar.gz
rtpmux: Unlock the right mutex
The mutex locked is for the 'mux' object, but we unlock the pad, which means that if the rtpmux gets a flush, then the object lock will stay locked forever, causing it to freeze the next time it tries to take it. Fixes bug #627991
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--gst/rtpmux/gstrtpmux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/rtpmux/gstrtpmux.c b/gst/rtpmux/gstrtpmux.c
index babf36d..a8e1583 100644
--- a/gst/rtpmux/gstrtpmux.c
+++ b/gst/rtpmux/gstrtpmux.c
@@ -699,7 +699,7 @@ gst_rtp_mux_sink_event (GstPad * pad, GstEvent * event)
padpriv = gst_pad_get_element_private (pad);
if (padpriv)
gst_segment_init (&padpriv->segment, GST_FORMAT_UNDEFINED);
- GST_OBJECT_UNLOCK (pad);
+ GST_OBJECT_UNLOCK (mux);
}
break;
case GST_EVENT_NEWSEGMENT: