diff options
| author | Youness Alaoui <youness.alaoui@collabora.co.uk> | 2011-08-22 23:41:31 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-08-23 09:20:14 +0200 |
| commit | 18f53cf547ea45f6eebc592f33aca9fcf68a0129 (patch) | |
| tree | b4647eaa4d40c33cc79a0b3c12ba4f4cb4b2009a | |
| parent | e2f69e1be9ff5907c468f3c348ffdc0132e00cc8 (diff) | |
hlsdemux: Do not take the pad stream lock, use the task's lock instead
| -rw-r--r-- | gst/hls/gsthlsdemux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c index 1a5806088..56d743fc7 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; } |