From a82f92aed2ff3cfb1be571c6437632760088189a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Fri, 2 Sep 2011 19:44:31 +0200
Subject: [PATCH] hlsdemux: Reset in PAUSED->READY after chaining up to the
 parent class

Otherwise there are possible race conditions with the streaming thread.
---
 gst/hls/gsthlsdemux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index 4f30bc50ad..aaff1065dd 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -287,7 +287,6 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition)
 
   switch (transition) {
     case GST_STATE_CHANGE_READY_TO_PAUSED:
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_hls_demux_reset (demux, FALSE);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
@@ -311,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_hls_demux_reset (demux, FALSE);
       break;
     default:
       break;