summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-10-15 11:02:02 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-10-15 11:04:06 +0200
commit477b04a28268f44720779c02679400c200bcf1a5 (patch)
treec02abb1ce0639d964ed35d18ac41a29090402564 /gst
parent113ccb1a532febf32274bf8561adf303c7f90c6e (diff)
downloadgstreamer-plugins-bad-477b04a28268f44720779c02679400c200bcf1a5.tar.gz
hlsdemux: Also hold the mutex before signalling the condition variable
Conflicts: gst/hls/gsturidownloader.c
Diffstat (limited to 'gst')
-rw-r--r--gst/hls/gsturidownloader.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gst/hls/gsturidownloader.c b/gst/hls/gsturidownloader.c
index 1ef7ddb17..7e95ec027 100644
--- a/gst/hls/gsturidownloader.c
+++ b/gst/hls/gsturidownloader.c
@@ -167,7 +167,9 @@ gst_uri_downloader_sink_event (GstPad * pad, GstObject * parent,
gst_util_get_timestamp ();
GST_OBJECT_UNLOCK (downloader);
GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
+ g_mutex_lock (&downloader->priv->lock);
g_cond_signal (&downloader->priv->cond);
+ g_mutex_unlock (&downloader->priv->lock);
} else {
GST_OBJECT_UNLOCK (downloader);
}
@@ -271,7 +273,9 @@ gst_uri_downloader_cancel (GstUriDownloader * downloader)
downloader->priv->download = NULL;
GST_OBJECT_UNLOCK (downloader);
GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
+ g_mutex_lock (&downloader->priv->lock);
g_cond_signal (&downloader->priv->cond);
+ g_mutex_unlock (&downloader->priv->lock);
} else {
GST_OBJECT_UNLOCK (downloader);
GST_DEBUG_OBJECT (downloader,