diff options
author | Thomas Bluemel <tbluemel@control4.com> | 2017-02-27 14:54:43 -0700 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2017-03-17 12:29:01 +0200 |
commit | 45cbd6428febce2da8da57b37c12a3465aadab3d (patch) | |
tree | 70249193695acd84272f5ae032a9efcc0650beff | |
parent | e0324d527aa75c9071ccc9c095552f70152b866c (diff) | |
download | gstreamer-plugins-bad-45cbd6428febce2da8da57b37c12a3465aadab3d.tar.gz |
adaptivemutex: Fix double mutex unlock
https://bugzilla.gnome.org/show_bug.cgi?id=779480
-rw-r--r-- | gst-libs/gst/adaptivedemux/gstadaptivedemux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c index e5b11a4c2..58f619535 100644 --- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c +++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c @@ -2801,6 +2801,11 @@ gst_adaptive_demux_stream_download_uri (GstAdaptiveDemux * demux, *http_status = stream->last_status_code; } } + + /* changing src element state might try to join the streaming thread, so + * we must not hold the manifest lock. + */ + GST_MANIFEST_UNLOCK (demux); } else { GST_MANIFEST_UNLOCK (demux); if (stream->last_ret == GST_FLOW_OK) @@ -2808,11 +2813,6 @@ gst_adaptive_demux_stream_download_uri (GstAdaptiveDemux * demux, ret = GST_FLOW_CUSTOM_ERROR; } - /* changing src element state might try to join the streaming thread, so - * we must not hold the manifest lock. - */ - GST_MANIFEST_UNLOCK (demux); - stream->src_at_ready = FALSE; gst_element_set_locked_state (stream->src, TRUE); |