diff options
author | Joshua Colp <jcolp@digium.com> | 2007-01-24 18:04:47 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2007-01-24 18:04:47 +0000 |
commit | 2396e24e65a886c66fb12ccf52ef65aea074f56a (patch) | |
tree | 125fdb28a123721a0683aec66603fac4e5be2dcf /channels | |
parent | 10d9ecf4233b6baafcd341cec275c248186b51f0 (diff) |
Merged revisions 52016 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r52016 | file | 2007-01-24 12:59:55 -0500 (Wed, 24 Jan 2007) | 2 lines
Fix changing channel formats when joint capability changes and there are no audio formats... I didn't break it originally! (issue #8535 reported by ivoc)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52025 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7fe149132..3dd98f54d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5290,7 +5290,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req) if (option_debug > 3) ast_log(LOG_DEBUG, "We have an owner, now see if we need to change this call\n"); - if (!(p->owner->nativeformats & p->jointcapability & AST_FORMAT_AUDIO_MASK) && (p->jointcapability & AST_FORMAT_AUDIO_MASK)) { + if (!(p->owner->nativeformats & p->jointcapability) && (p->jointcapability & AST_FORMAT_AUDIO_MASK)) { if (debug) { char s1[BUFSIZ], s2[BUFSIZ]; ast_log(LOG_DEBUG, "Oooh, we need to change our audio formats since our peer supports only %s and not %s\n", |