Merge "bridge_softmix / res_rtp_asterisk: Fix packet loss and renegotiation issues."
authorJoshua Colp <jcolp@digium.com>
Wed, 26 Jul 2017 13:31:13 +0000 (08:31 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 26 Jul 2017 13:31:13 +0000 (08:31 -0500)
1  2 
bridges/bridge_softmix.c
main/rtp_engine.c

Simple merge
Simple merge