From b6e10be2780db0f36dd5d0331885797a3589b153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 2 Mar 2016 13:13:24 +0200 Subject: Revert "rtpjitterbuffer: don't forget to unlock mutex in error code path in two cases" This reverts commit a7fb7b53592d87f7983544debb74d364fc3257ad. The mutex is taken by the caller, we should keep it locked when returning so the caller can unlock it again. --- gst/rtpmanager/gstrtpjitterbuffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index 7784bb287..610eff210 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -1730,7 +1730,6 @@ no_caps: } out_flushing: { - JBUF_UNLOCK (jitterbuffer->priv); GST_DEBUG_OBJECT (jitterbuffer, "we are flushing"); return GST_FLOW_FLUSHING; } @@ -3052,7 +3051,6 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum) /* ERRORS */ out_flushing: { - JBUF_UNLOCK (priv); return priv->srcresult; } } -- cgit v1.2.1