From 18f53cf547ea45f6eebc592f33aca9fcf68a0129 Mon Sep 17 00:00:00 2001
From: Youness Alaoui <youness.alaoui@collabora.co.uk>
Date: Mon, 22 Aug 2011 23:41:31 +0000
Subject: [PATCH] hlsdemux: Do not take the pad stream lock, use the task's
 lock instead

---
 gst/hls/gsthlsdemux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index 1a58060884..56d743fc74 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -372,7 +372,7 @@ gst_hls_demux_src_event (GstPad * pad, GstEvent * event)
       g_cond_signal (demux->thread_cond);
 
       /* wait for streaming to finish */
-      GST_PAD_STREAM_LOCK (demux->srcpad);
+      g_static_rec_mutex_lock (&demux->task_lock);
 
       demux->need_cache = TRUE;
       while (!g_queue_is_empty (demux->queue)) {
@@ -391,7 +391,7 @@ gst_hls_demux_src_event (GstPad * pad, GstEvent * event)
       }
 
       gst_task_start (demux->task);
-      GST_PAD_STREAM_UNLOCK (demux->srcpad);
+      g_static_rec_mutex_unlock (&demux->task_lock);
 
       return TRUE;
     }