[svn-commits] jpeeler: branch 1.4 r208923 - in /branches/1.4: channels/ main/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Sun Jul 26 20:18:31 2009
New Revision: 208923

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=208923
Log:
Fix logic errors from 208746

Modified:
    branches/1.4/channels/chan_iax2.c
    branches/1.4/main/translate.c

Modified: branches/1.4/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/channels/chan_iax2.c?view=diff&rev=208923&r1=208922&r2=208923
==============================================================================
--- branches/1.4/channels/chan_iax2.c (original)
+++ branches/1.4/channels/chan_iax2.c Sun Jul 26 20:18:31 2009
@@ -3722,7 +3722,7 @@
 		return AST_BRIDGE_FAILED;
 	}
 	/* Put them in native bridge mode */
-	if ((!flags) & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) {
+	if (!(flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))) {
 		iaxs[callno0]->bridgecallno = callno1;
 		iaxs[callno1]->bridgecallno = callno0;
 	}

Modified: branches/1.4/main/translate.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/main/translate.c?view=diff&rev=208923&r1=208922&r2=208923
==============================================================================
--- branches/1.4/main/translate.c (original)
+++ branches/1.4/main/translate.c Sun Jul 26 20:18:31 2009
@@ -920,7 +920,7 @@
 	   destination format. */
 	for (x = 1; src_audio && x < AST_FORMAT_MAX_AUDIO; x <<= 1) {
 		/* if this is not a desired format, nothing to do */
-		if ((!dest) & x)
+		if (!(dest & x))
 			continue;
 
 		/* if the source is supplying this format, then
@@ -946,7 +946,7 @@
 	   destination format. */
 	for (; src_video && x < AST_FORMAT_MAX_VIDEO; x <<= 1) {
 		/* if this is not a desired format, nothing to do */
-		if ((!dest) & x)
+		if (!(dest & x))
 			continue;
 
 		/* if the source is supplying this format, then