diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-08-23 11:55:01 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-08-23 11:55:01 -0500 |
commit | 1e579b11853ec02e79030680610fe4d66b7a80f3 (patch) | |
tree | bae4ab0ec5c4f30cee9baa1206624be1602f9c9a /bridges | |
parent | aad6fa6dc7f57531054519e9916455a301a2c442 (diff) | |
parent | 946ef2d711e47f0dd939879bca06e22e44e18451 (diff) |
Merge "bridge_softmix.c: Remove always true test."
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/bridge_softmix.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index b35994895..b9a0e98ad 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -1060,14 +1060,10 @@ static int softmix_bridge_write(struct ast_bridge *bridge, struct ast_bridge_cha res = ast_bridge_queue_everyone_else(bridge, bridge_channel, frame); break; case AST_FRAME_VOICE: - if (bridge_channel) { - softmix_bridge_write_voice(bridge, bridge_channel, frame); - } + softmix_bridge_write_voice(bridge, bridge_channel, frame); break; case AST_FRAME_VIDEO: - if (bridge_channel) { - softmix_bridge_write_video(bridge, bridge_channel, frame); - } + softmix_bridge_write_video(bridge, bridge_channel, frame); break; case AST_FRAME_CONTROL: res = softmix_bridge_write_control(bridge, bridge_channel, frame); |