diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-08-31 14:48:47 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-08-31 14:48:47 +0200 |
| commit | cf8f00d57a7177b6ae719ae00c262eff37d5feea (patch) | |
| tree | 5fa36504ca935a3e3fb5b65fac12ca9bf2bee634 /gst/hls | |
| parent | 119771eaabb67e43c3a5929f7c9327d6b1f9bb08 (diff) | |
| download | gstreamer-plugins-bad-cf8f00d57a7177b6ae719ae00c262eff37d5feea.tar.gz | |
hlsdemux: Just join the task
gst_task_join() will already stop the task, no need
to stop it additionally.
Diffstat (limited to 'gst/hls')
| -rw-r--r-- | gst/hls/gsthlsdemux.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c index 522699bbd..a24441c37 100644 --- a/gst/hls/gsthlsdemux.c +++ b/gst/hls/gsthlsdemux.c @@ -156,10 +156,7 @@ gst_hls_demux_dispose (GObject * obj) g_cond_free (demux->thread_cond); g_mutex_free (demux->thread_lock); - if (GST_TASK_STATE (demux->task) != GST_TASK_STOPPED) { - gst_task_stop (demux->task); - gst_task_join (demux->task); - } + gst_task_join (demux->task); gst_object_unref (demux->task); g_static_rec_mutex_free (&demux->task_lock); |