hlsdemux: Also hold the mutex before signalling the condition variable

Conflicts:
	gst/hls/gsturidownloader.c
This commit is contained in:
Sebastian Dröge 2012-10-15 11:02:02 +02:00
parent 113ccb1a53
commit 477b04a282

View file

@ -167,7 +167,9 @@ gst_uri_downloader_sink_event (GstPad * pad, GstObject * parent,
gst_util_get_timestamp (); gst_util_get_timestamp ();
GST_OBJECT_UNLOCK (downloader); GST_OBJECT_UNLOCK (downloader);
GST_DEBUG_OBJECT (downloader, "Signaling chain funtion"); GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
g_mutex_lock (&downloader->priv->lock);
g_cond_signal (&downloader->priv->cond); g_cond_signal (&downloader->priv->cond);
g_mutex_unlock (&downloader->priv->lock);
} else { } else {
GST_OBJECT_UNLOCK (downloader); GST_OBJECT_UNLOCK (downloader);
} }
@ -271,7 +273,9 @@ gst_uri_downloader_cancel (GstUriDownloader * downloader)
downloader->priv->download = NULL; downloader->priv->download = NULL;
GST_OBJECT_UNLOCK (downloader); GST_OBJECT_UNLOCK (downloader);
GST_DEBUG_OBJECT (downloader, "Signaling chain funtion"); GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
g_mutex_lock (&downloader->priv->lock);
g_cond_signal (&downloader->priv->cond); g_cond_signal (&downloader->priv->cond);
g_mutex_unlock (&downloader->priv->lock);
} else { } else {
GST_OBJECT_UNLOCK (downloader); GST_OBJECT_UNLOCK (downloader);
GST_DEBUG_OBJECT (downloader, GST_DEBUG_OBJECT (downloader,