diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2011-10-11 05:06:42 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2011-10-11 05:06:42 +0000 |
commit | cd27c9da852fb6008d03cf2e87cd56a7979bf0dd (patch) | |
tree | d88d75e682d9b3caffaae680868d97cbea0e3cec /pjmedia/src | |
parent | fa19def3a145865a1852591fc0a47122b03b3ccf (diff) |
Fixed #1385: fixed match_offer() of SDP negotiator in comparing rtpmap encoding params (specifying channel count) in preanswer and remote-offer.
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3812 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
-rw-r--r-- | pjmedia/src/pjmedia/sdp_neg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c index 2e3dde6d..57e29eb9 100644 --- a/pjmedia/src/pjmedia/sdp_neg.c +++ b/pjmedia/src/pjmedia/sdp_neg.c @@ -1177,7 +1177,10 @@ static pj_status_t match_offer(pj_pool_t *pool, if (!pj_stricmp(&or_.enc_name, &lr.enc_name) && or_.clock_rate == lr.clock_rate && (pj_stricmp(&or_.param, &lr.param)==0 || - (or_.param.slen==1 && *or_.param.ptr=='1'))) + (lr.param.slen==0 && or_.param.slen==1 && + *or_.param.ptr=='1') || + (or_.param.slen==0 && lr.param.slen==1 && + *lr.param.ptr=='1'))) { /* Match! */ if (is_codec) { |