diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-03-02 13:13:24 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-03-02 13:13:24 +0200 |
| commit | b6e10be2780db0f36dd5d0331885797a3589b153 (patch) | |
| tree | 95d610a784c3af92146b58312504242b30ebf846 | |
| parent | 4065fcb80a49924b70f0c8fc159dec0ff47943a1 (diff) | |
| download | gstreamer-plugins-good-b6e10be2780db0f36dd5d0331885797a3589b153.tar.gz | |
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.
| -rw-r--r-- | gst/rtpmanager/gstrtpjitterbuffer.c | 2 |
1 files changed, 0 insertions, 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; } } |