Merge "Add primitive SFU support to bridge_softmix."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Tue, 6 Jun 2017 11:57:24 +0000 (06:57 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 6 Jun 2017 11:57:24 +0000 (06:57 -0500)
1  2 
main/bridge_channel.c

Simple merge