From: Joshua Colp <jcolp@digium.com>
Date: Tue, 23 Jan 2007 03:02:09 +0000 (+0000)
Subject: Merged revisions 51558 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3389
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a25c156c68653cb9d2cb6c3ee69b993974105c0;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e12ad2087f..71674468f8 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",