[asterisk-commits] jpeeler: branch 1.6.1 r208926 - in /branches/1.6.1: ./ channels/ main/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Sun Jul 26 20:22:31 2009
New Revision: 208926

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=208926
Log:
Merged revisions 208924 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r208924 | jpeeler | 2009-07-26 20:20:37 -0500 (Sun, 26 Jul 2009) | 9 lines
  
  Merged revisions 208923 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r208923 | jpeeler | 2009-07-26 20:18:31 -0500 (Sun, 26 Jul 2009) | 2 lines
    
    Fix logic errors from 208746
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c
    branches/1.6.1/main/translate.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=208926&r1=208925&r2=208926
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Sun Jul 26 20:22:31 2009
@@ -4110,7 +4110,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.6.1/main/translate.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/translate.c?view=diff&rev=208926&r1=208925&r2=208926
==============================================================================
--- branches/1.6.1/main/translate.c (original)
+++ branches/1.6.1/main/translate.c Sun Jul 26 20:22:31 2009
@@ -855,7 +855,7 @@
 	   destination format. */
 	for (x = 1; src_audio && (x & AST_FORMAT_AUDIO_MASK); 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
@@ -881,7 +881,7 @@
 	   destination format. */
 	for (; src_video && (x & AST_FORMAT_VIDEO_MASK); 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