[farsight2/master] Don't overwrite already discovered config parameters

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:23:32 PST 2008


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

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index b565fd5..dad9718 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -3331,10 +3331,8 @@ _discovery_caps_changed (GstPad *pad, GParamSpec *pspec, FsRtpSession *session)
   ca = lookup_codec_association_by_codec (session->priv->codec_associations,
       session->priv->discovery_codec);
 
-  if (!ca)
-    goto out;
-
-  gather_caps_parameters (ca, caps);
+  if (ca && ca->need_config)
+    gather_caps_parameters (ca, caps);
 
   fs_codec_destroy (session->priv->discovery_codec);
   session->priv->discovery_codec = NULL;
-- 
1.5.6.5




More information about the farsight-commits mailing list