[farsight2/master] Stop send elements in the right order

Olivier Crête olivier.crete at collabora.co.uk
Wed Dec 17 18:10:23 PST 2008


---
 gst/fsrtpconference/fs-rtp-session.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 6fd2a97..6793196 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -507,9 +507,6 @@ fs_rtp_session_dispose (GObject *object)
 
   stop_and_remove (conferencebin, &self->priv->rtpmuxer, TRUE);
   stop_and_remove (conferencebin, &self->priv->send_capsfilter, TRUE);
-  stop_and_remove (conferencebin, &self->priv->send_codecbin, FALSE);
-  stop_and_remove (conferencebin, &self->priv->send_tee, TRUE);
-  stop_and_remove (conferencebin, &self->priv->media_sink_valve, TRUE);
 
   while (self->priv->extra_send_capsfilters)
   {
@@ -521,6 +518,10 @@ fs_rtp_session_dispose (GObject *object)
         self->priv->extra_send_capsfilters);
   }
 
+  stop_and_remove (conferencebin, &self->priv->send_codecbin, FALSE);
+  stop_and_remove (conferencebin, &self->priv->send_tee, TRUE);
+  stop_and_remove (conferencebin, &self->priv->media_sink_valve, TRUE);
+
   if (self->priv->media_sink_pad)
     gst_pad_set_active (self->priv->media_sink_pad, FALSE);
 
-- 
1.5.6.5




More information about the farsight-commits mailing list