diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-01-23 03:02:09 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-01-23 03:02:09 +0000 |
| commit | 5a25c156c68653cb9d2cb6c3ee69b993974105c0 (patch) | |
| tree | c494f6bbefbbae8f2725d8b0958084f1e155d400 /channels | |
| parent | 445abea012b7ccabea159ffac212665edb3a96cc (diff) | |
Merged revisions 51558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51558 | file | 2007-01-22 22:00:12 -0500 (Mon, 22 Jan 2007) | 2 lines
Only change audio formats on the channel if we have an audio format to change to. (issue #8535 reported by ivoc)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51559 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 e12ad2087..71674468f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5278,7 +5278,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)) { + if (!(p->owner->nativeformats & p->jointcapability & AST_FORMAT_AUDIO_MASK) && (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", |