From 5cc57a82f079d50a5f6daa8601e44fea3e7631eb Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Wed, 25 Aug 2010 22:56:03 -0400 Subject: [PATCH] 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 --- gst/rtpmux/gstrtpmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst/rtpmux/gstrtpmux.c b/gst/rtpmux/gstrtpmux.c index babf36d5b6..a8e158341d 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: