[farsight2/master] Generate negotiated codecs from the codec associations list

[Olivier Crête]

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

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 3facbed..f30da17 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -546,9 +546,15 @@ fs_rtp_session_get_property (GObject *object,
       g_value_set_boxed (value, self->priv->local_codecs_configuration);
       break;
     case PROP_NEGOTIATED_CODECS:
-      FS_RTP_SESSION_LOCK (self);
-      g_value_set_boxed (value, self->priv->negotiated_codecs);
-      FS_RTP_SESSION_UNLOCK (self);
+      {
+        GList *negotiated_codecs = NULL;
+        FS_RTP_SESSION_LOCK (self);
+        negotiated_codecs = codec_associations_to_codecs (
+            self->priv->negotiated_codec_associations);
+        FS_RTP_SESSION_UNLOCK (self);
+        g_value_take_boxed (value, negotiated_codecs);
+        break;
+      }
       break;
     case PROP_CONFERENCE:
       g_value_set_object (value, self->priv->conference);
-- 
1.5.6.5