kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bridge_softmix.c: Remove always true test." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-08-23 11:20:33 -05:00
committed by Gerrit Code Review
parent b88c3a4209 3f22b53349
commit e8cfd5a80f
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/bridge_softmix.c
View File

@@ -727,14 +727,10 @@ static int softmix_bridge_write(struct ast_bridge *bridge, struct ast_bridge_cha
res = ast_bridge_queue_everyone_else(bridge, bridge_channel, frame); res = ast_bridge_queue_everyone_else(bridge, bridge_channel, frame);
break; break;
case AST_FRAME_VOICE: case AST_FRAME_VOICE:
if (bridge_channel) { softmix_bridge_write_voice(bridge, bridge_channel, frame);
softmix_bridge_write_voice(bridge, bridge_channel, frame);
}
break; break;
case AST_FRAME_VIDEO: case AST_FRAME_VIDEO:
if (bridge_channel) { softmix_bridge_write_video(bridge, bridge_channel, frame);
softmix_bridge_write_video(bridge, bridge_channel, frame);
}
break; break;
case AST_FRAME_CONTROL: case AST_FRAME_CONTROL:
res = softmix_bridge_write_control(bridge, bridge_channel, frame); res = softmix_bridge_write_control(bridge, bridge_channel, frame);