diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2005-10-10 12:31:07 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2005-10-10 12:31:07 +0000 |
| commit | af9fad29535853620b1121b6030ef4580b34b128 (patch) | |
| tree | 539d043070219b7f590057bef88edbf170af412c | |
| parent | e2d6dc55287c9bde76b37a4e3c83e9cebc06fd39 (diff) | |
ext/gconf/: Make sure element is NULL before removing from the bin.
Original commit message from CVS:
* ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_reset):
* ext/gconf/gstgconfvideosink.c: (gst_gconf_video_sink_reset):
Make sure element is NULL before removing from the bin.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/gconf/gstgconfaudiosink.c | 1 | ||||
| -rw-r--r-- | ext/gconf/gstgconfvideosink.c | 1 |
3 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2005-10-10 Wim Taymans <wim@fluendo.com> + + * ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_reset): + * ext/gconf/gstgconfvideosink.c: (gst_gconf_video_sink_reset): + Make sure element is NULL before removing from the bin. + 2005-10-07 Andy Wingo <wingo@pobox.com> * ext/raw1394/gstdv1394src.c: Make interruptible, so it won't diff --git a/ext/gconf/gstgconfaudiosink.c b/ext/gconf/gstgconfaudiosink.c index 5c734da2..e849c7db 100644 --- a/ext/gconf/gstgconfaudiosink.c +++ b/ext/gconf/gstgconfaudiosink.c @@ -74,6 +74,7 @@ gst_gconf_audio_sink_reset (GstGConfAudioSink * sink) /* fakesink */ if (sink->kid) { + gst_element_set_state (sink->kid, GST_STATE_NULL); gst_bin_remove (GST_BIN (sink), sink->kid); } sink->kid = gst_element_factory_make ("fakesink", "testsink"); diff --git a/ext/gconf/gstgconfvideosink.c b/ext/gconf/gstgconfvideosink.c index ccdc3018..f1f7eff8 100644 --- a/ext/gconf/gstgconfvideosink.c +++ b/ext/gconf/gstgconfvideosink.c @@ -74,6 +74,7 @@ gst_gconf_video_sink_reset (GstGConfVideoSink * sink) /* fakesink */ if (sink->kid) { + gst_element_set_state (sink->kid, GST_STATE_NULL); gst_bin_remove (GST_BIN (sink), sink->kid); } sink->kid = gst_element_factory_make ("fakesink", "testsink"); |