[farsight2/master] Don't pass useless list of local codecs into codec negotiation function

[Olivier Crête]

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

diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
index 012fa94..ab9fa2b 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
@@ -500,7 +500,6 @@ _do_sdp_codec_nego (gpointer key, gpointer value, gpointer user_data)
  * negotiate_codecs:
  * @remote_codecs: The list of remote codecs passed from the other side
  * @local_codec_associations: The hash table of local codec associations
- * @local_codecs: The ordered list of local codecs
  * @use_local_ids: Wheter to use local or remote PTs if they dont match (%TRUE
  *  for local, %FALSE for remote)
  * @negotiated_codecs_out: A pointer to a pointer to a #GList where the ordered
@@ -515,7 +514,7 @@ _do_sdp_codec_nego (gpointer key, gpointer value, gpointer user_data)
 GHashTable *
 negotiate_codecs (const GList *remote_codecs,
     GHashTable *negotiated_codec_associations,
-    GHashTable *local_codec_associations, GList *local_codecs,
+    GHashTable *local_codec_associations,
     gboolean use_local_ids,
     GList **negotiated_codecs_out)
 {
@@ -526,7 +525,6 @@ negotiate_codecs (const GList *remote_codecs,
 
   g_return_val_if_fail (remote_codecs, NULL);
   g_return_val_if_fail (local_codec_associations, NULL);
-  g_return_val_if_fail (local_codecs, NULL);
 
   new_codec_associations = g_hash_table_new_full (g_direct_hash,
       g_direct_equal, NULL, (GDestroyNotify) _codec_association_destroy);
diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.h b/gst/fsrtpconference/fs-rtp-codec-negotiation.h
index eb3c07a..e34b452 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.h
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.h
@@ -44,7 +44,7 @@ GHashTable *create_local_codec_associations (FsMediaType media_type,
 
 GHashTable *negotiate_codecs (const GList *remote_codecs,
     GHashTable *current_negotiated_codec_associations,
-    GHashTable *local_codec_associations, GList *local_codecs,
+    GHashTable *local_codec_associations,
     gboolean use_local_ids,
     GList **new_negotiated_codecs);
 
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 67d456a..4aa0957 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -1581,7 +1581,6 @@ fs_rtp_session_negotiate_codecs (FsRtpSession *session,
   new_negotiated_codec_associations = negotiate_codecs (remote_codecs,
     session->priv->negotiated_codec_associations,
     session->priv->local_codec_associations,
-    session->priv->local_codecs,
     has_many_streams,
     &new_negotiated_codecs);
 
-- 
1.5.6.5