[0.11] gst-plugins-bad: hlsdemux: Do not join the task from the task' s thread itself. join it only in the state change

[Wim Taymans]

Module: gst-plugins-bad
Branch: 0.11
Commit: baf875b928a1321d30046cf643736f3459c55d7f
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=baf875b928a1321d30046cf643736f3459c55d7f

Author: Youness Alaoui <youness.alaoui at collabora.co.uk>
Date:   Wed Sep  7 20:09:12 2011 +0000

hlsdemux: Do not join the task from the task's thread itself. join it only in the state change

---

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

diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index 143f363..ea23ef6 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -310,6 +310,7 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition)
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       demux->cancelled = TRUE;
       gst_hls_demux_stop (demux);
+      gst_task_join (demux->task);
       gst_hls_demux_reset (demux, FALSE);
       break;
     default:
@@ -665,7 +666,7 @@ gst_hls_demux_stop (GstHLSDemux * demux)
   g_mutex_lock (demux->fetcher_lock);
   gst_hls_demux_stop_fetcher_locked (demux, TRUE);
   g_mutex_unlock (demux->fetcher_lock);
-  gst_task_join (demux->task);
+  gst_task_stop (demux->task);
   gst_hls_demux_stop_update (demux);
 }