[farsight2/master] Improve appearance

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


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

diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
index 339fcf6..3049042 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
@@ -319,7 +319,9 @@ create_local_codec_associations (
     if (codec_pref->id == FS_CODEC_ID_DISABLE)
       continue;
 
-    /* If we want to disable a codec ID, we just insert a NULL in the table */
+    /* If we want to disable a codec ID, we just insert a reserved codec assoc
+     * in the list
+     */
     if (codec_pref->id >= 0 && codec_pref->id < 128 &&
         codec_pref->encoding_name &&
         !g_ascii_strcasecmp (codec_pref->encoding_name, "reserve-pt"))
@@ -773,8 +775,7 @@ codec_associations_to_codecs (GList *codec_associations)
     CodecAssociation *ca = item->data;
     if (!ca->disable && !ca->reserved && !ca->recv_only && ca->codec)
     {
-      codecs = g_list_append (codecs,
-          fs_codec_copy (ca->codec));
+      codecs = g_list_append (codecs, fs_codec_copy (ca->codec));
     }
   }
 
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 459f588..55c42ae 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -539,6 +539,7 @@ fs_rtp_session_get_property (GObject *object,
       {
         GList *local_codecs = NULL;
         GList *local_codec_associations = NULL;
+
         FS_RTP_SESSION_LOCK (self);
         local_codec_associations = create_local_codec_associations (
             self->priv->blueprints,
@@ -547,6 +548,7 @@ fs_rtp_session_get_property (GObject *object,
         local_codecs = codec_associations_to_codecs (local_codec_associations);
         codec_association_list_destroy (local_codec_associations);
         FS_RTP_SESSION_UNLOCK (self);
+
         g_value_take_boxed (value, local_codecs);
         break;
       }
@@ -1228,7 +1230,7 @@ fs_rtp_session_set_local_codecs_config (FsSession *session,
     GError **error)
 {
   FsRtpSession *self = FS_RTP_SESSION (session);
-  GList  *new_local_codec_associations = NULL;
+  GList *new_local_codec_associations = NULL;
   GList *new_local_codecs_configuration =
     fs_codec_list_copy (local_codecs_config);
 
-- 
1.5.6.5




More information about the farsight-commits mailing list