[farsight2/master] Fix double unlocks

Olivier Crête olivier.crete at collabora.co.uk
Fri Dec 19 17:17:04 PST 2008


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

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 43a75fb..cd522c1 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -2181,8 +2181,6 @@ fs_rtp_session_update_codecs (FsRtpSession *session,
   {
     if (!fs_rtp_session_verify_send_codec_bin_unlock (session, error))
       return FALSE;
-    else
-      FS_RTP_SESSION_UNLOCK (session);
   }
   else
   {
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index 56b2cb2..eeacdb2 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -543,7 +543,6 @@ fs_rtp_stream_set_remote_codecs (FsStream *stream,
   return TRUE;
 
  error:
-  FS_RTP_SESSION_UNLOCK (self->priv->session);
   return FALSE;
 }
 
-- 
1.5.6.5




More information about the farsight-commits mailing list