summaryrefslogtreecommitdiff
path: root/ext/smoothstreaming
diff options
context:
space:
mode:
authorThiago Santos <ts.santos@partner.samsung.com>2013-11-13 22:25:59 -0300
committerThiago Santos <ts.santos@partner.samsung.com>2013-11-15 12:01:55 -0300
commit27b0086e4a06616b790e387413c5874108d0d1e1 (patch)
treeacfebec727517521c2cde452b7a58ef03d24c114 /ext/smoothstreaming
parentfe77ee47c957a563dd879387eae902deefecf86f (diff)
downloadgstreamer-plugins-bad-27b0086e4a06616b790e387413c5874108d0d1e1.tar.gz
mssdemux: do not try to deinit the downloadrate while it is used
This can cause an assertion or deadlocks.
Diffstat (limited to 'ext/smoothstreaming')
-rw-r--r--ext/smoothstreaming/gstmssdemux.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/smoothstreaming/gstmssdemux.c b/ext/smoothstreaming/gstmssdemux.c
index 058016c23..368863969 100644
--- a/ext/smoothstreaming/gstmssdemux.c
+++ b/ext/smoothstreaming/gstmssdemux.c
@@ -255,7 +255,6 @@ gst_mss_demux_stream_new (GstMssDemux * mssdemux,
static void
gst_mss_demux_stream_free (GstMssDemuxStream * stream)
{
- gst_download_rate_deinit (&stream->download_rate);
if (stream->download_task) {
if (GST_TASK_STATE (stream->download_task) != GST_TASK_STOPPED) {
GST_DEBUG_OBJECT (stream->parent, "Leaving streaming task %s:%s",
@@ -273,12 +272,12 @@ gst_mss_demux_stream_free (GstMssDemuxStream * stream)
stream->download_task = NULL;
}
+ gst_download_rate_deinit (&stream->download_rate);
if (stream->pending_newsegment) {
gst_event_unref (stream->pending_newsegment);
stream->pending_newsegment = NULL;
}
-
if (stream->downloader != NULL) {
g_object_unref (stream->downloader);
stream->downloader = NULL;