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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@208926 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

@@ -4110,7 +4110,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
 		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;
 	}

main/translate.c

@@ -855,7 +855,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
 	   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 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
 	   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