diff options
| author | Thomas Bluemel <tbluemel@control4.com> | 2017-02-27 14:54:43 -0700 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-03-02 19:02:32 +0200 |
| commit | 8d10d29c2420c2580686d68316eca2ff326b5272 (patch) | |
| tree | 49343de22816acd2423f899b4afd4c69c7b7f85c /gst-libs | |
| parent | 6da14bdb884b0b9b483b8c200c6c1b59e219fbb5 (diff) | |
| download | gstreamer-plugins-bad-8d10d29c2420c2580686d68316eca2ff326b5272.tar.gz | |
adaptivemutex: Fix double mutex unlock
https://bugzilla.gnome.org/show_bug.cgi?id=779480
Diffstat (limited to 'gst-libs')
| -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 4d8c2b071..e46dc3a4b 100644 --- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c +++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c @@ -2983,6 +2983,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) @@ -2990,11 +2995,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); |