diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 01:21:54 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 01:21:54 +0000 |
| commit | b48545a5641c323ecb9389bb8f0f521af3d410f5 (patch) | |
| tree | e023496d08021adf8e3ec5d7d0bc2592efd02e37 | |
| parent | 8778c1d6f256c50a6c00160c04607adfde2319f2 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@208925 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 2 | ||||
| -rw-r--r-- | main/translate.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1627b4e79..4ce92f3d3 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4013,7 +4013,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; } diff --git a/main/translate.c b/main/translate.c index 500d40ff1..711a7995c 100644 --- a/main/translate.c +++ b/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 |