mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-04 13:57:31 -07:00
Fix logic errors from 208746
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@208923 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3722,7 +3722,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;
|
||||
}
|
||||
|
||||
+2
-2
@@ -920,7 +920,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
|
||||
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 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user