Merge "bridge_softmix / res_rtp_asterisk: Fix packet loss and renegotiation issues."

author Joshua Colp <jcolp@digium.com>

Wed, 26 Jul 2017 13:31:13 +0000 (08:31 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Wed, 26 Jul 2017 13:31:13 +0000 (08:31 -0500)
author Joshua Colp <jcolp@digium.com>
Wed, 26 Jul 2017 13:31:13 +0000 (08:31 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 26 Jul 2017 13:31:13 +0000 (08:31 -0500)
diff --cc bridges/bridge_softmix.c
Simple merge
diff --cc main/rtp_engine.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Wed, 26 Jul 2017 13:31:13 +0000 (08:31 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 26 Jul 2017 13:31:13 +0000 (08:31 -0500)
		1	2
bridges/bridge_softmix.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/rtp_engine.c	patch \|	diff1 \|	diff2 \|	blob \| history