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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7fe1491..3dd98f5 100644 (file)
--- 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",