From 51147aee3c481148836649454fd4615dda087c30 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 25 Aug 2010 15:22:14 +0200 Subject: [PATCH] integration of g722 codec --- coreapi/offeranswer.c | 4 ++-- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c index 22901242a..6bd21863c 100644 --- a/coreapi/offeranswer.c +++ b/coreapi/offeranswer.c @@ -30,8 +30,8 @@ static PayloadType * find_payload_type_best_match(const MSList *l, const Payload for (elem=l;elem!=NULL;elem=elem->next){ pt=(PayloadType*)elem->data; /* the compare between G729 and G729A is for some stupid uncompliant phone*/ - if (strcasecmp(pt->mime_type,refpt->mime_type)==0 || - ((strcasecmp(pt->mime_type, "G729") == 0 && strcasecmp(refpt->mime_type, "G729A") == 0 )) + if ( (strcasecmp(pt->mime_type,refpt->mime_type)==0 || + (strcasecmp(pt->mime_type, "G729") == 0 && strcasecmp(refpt->mime_type, "G729A") == 0 )) && pt->clock_rate==refpt->clock_rate){ candidate=pt; /*good candidate, check fmtp for H264 */ diff --git a/mediastreamer2 b/mediastreamer2 index 6cc9076b9..030250c16 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 6cc9076b9cc4d6b88e7a0b93e6abdd1ad881e832 +Subproject commit 030250c162f546af5b1c2b97e51a71d81a73679b diff --git a/oRTP b/oRTP index d2a8cb089..6bc540160 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit d2a8cb0890c7547703a092c839c55db10449ef92 +Subproject commit 6bc540160a8729f63f6074b958161bc696e78f93