[farsight2/master] Revert "Don't change the PT if we're re-using an already existing codecassociation"
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 16 12:25:12 PST 2008
This reverts commit 53005f7023613a06a80dd34f25f930c62bcaba90.
---
gst/fsrtpconference/fs-rtp-codec-negotiation.c | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
index 25aa711..e65dcac 100644
--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
@@ -697,21 +697,11 @@ create_local_codec_associations (
lca_e = g_list_next (lca_e))
{
CodecAssociation *lca = lca_e->data;
- CodecAssociation *tmpca = NULL;
if (lca->reserved)
continue;
- tmpca = lookup_codec_association_by_pt_list (current_codec_associations,
- lca->codec->id, TRUE);
-
- /* Same blueprint, we've copied the ID voluntarily, continue */
- if (tmpca && tmpca->blueprint == lca->blueprint)
- continue;
-
- /* If we have a different blueprint or a ANY id, we have to get a new id
- */
- if (tmpca || lca->codec->id < 0)
+ if (lca->codec->id < 0)
{
lca->codec->id = _find_first_empty_dynamic_entry (
current_codec_associations, codec_associations);
--
1.5.6.5
More information about the farsight-commits
mailing list