diff options
| author | Mark Nauwelaerts <manauw@skynet.be> | 2006-05-23 20:15:04 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-05-23 20:15:04 +0000 |
| commit | d4e266cd6dd1d0aad4942f48fe427f2a6ccf870e (patch) | |
| tree | cbeae5f19dec9a05b07ee32a359e81d9723d81bc | |
| parent | 13518af4c3609b0458f61469894cd5a098e49346 (diff) | |
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 <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).
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/matroska/matroska-mux.c | 4 |
2 files changed, 11 insertions, 1 deletions
@@ -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: |