summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--gst/matroska/matroska-mux.c4
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e80a0c2c..6f95aa96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-05-23 Tim-Philipp Müller <tim at centricular dot net>
+ Patch by: Mark Nauwelaerts <manauw at skynet be>
+
+ * gst/matroska/matroska-mux.c: (gst_matroska_mux_change_state):
+ gst_collect_pads_stop() needs to be called before chaining up
+ to the parent class (#342734).
+
+2006-05-23 Tim-Philipp Müller <tim at centricular dot net>
+
* ext/flac/Makefile.am:
* ext/flac/flac_compat.h:
* ext/flac/gstflac.c:
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 2b76df07..59495053 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1722,6 +1722,9 @@ gst_matroska_mux_change_state (GstElement * element, GstStateChange transition)
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
+ gst_collect_pads_stop (mux->collect);
+ break;
default:
break;
}
@@ -1732,7 +1735,6 @@ gst_matroska_mux_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
- gst_collect_pads_stop (mux->collect);
gst_matroska_mux_reset (GST_ELEMENT (mux));
break;
case GST_STATE_CHANGE_READY_TO_NULL: