[svn-commits] file: trunk r52025 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Jan 24 12:04:47 2007
New Revision: 52025

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52025
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=52025&r1=52024&r2=52025
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jan 24 12:04:47 2007
@@ -5290,7 +5290,7 @@
 	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",