From d4e266cd6dd1d0aad4942f48fe427f2a6ccf870e Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Tue, 23 May 2006 20:15:04 +0000 Subject: [PATCH] gst/matroska/matroska-mux.c: gst_collect_pads_stop() needs to be called before chaining up to the parent class (#3427... Original commit message from CVS: Patch by: Mark Nauwelaerts * 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). --- ChangeLog | 8 ++++++++ gst/matroska/matroska-mux.c | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e80a0c2..6f95aa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2006-05-23 Tim-Philipp Müller + Patch by: Mark Nauwelaerts + + * 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 + * 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 2b76df0..5949505 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: -- 2.7.4