[farsight2/master] Don't use ca after unlocking, and invalidate ca just in case

Olivier Crête olivier.crete at collabora.co.uk
Thu Feb 12 06:33:00 PST 2009


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

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index c24beb5..fe5e091 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -4026,6 +4026,8 @@ fs_rtp_session_get_codec_params_unlock (FsRtpSession *session,
   g_free (tmp);
 
   FS_RTP_SESSION_UNLOCK (session);
+  /* Invalidate CA because we've just unlocked */
+  ca = NULL;
 
   if (session->priv->discovery_codecbin)
   {
@@ -4145,7 +4147,7 @@ fs_rtp_session_get_codec_params_unlock (FsRtpSession *session,
     goto error;
   }
 
-  caps = fs_codec_to_gst_caps (ca->codec);
+  caps = fs_codec_to_gst_caps (codec);
   g_object_set (session->priv->discovery_capsfilter,
       "caps", caps,
       NULL);
-- 
1.5.6.5



More information about the farsight-commits mailing list