Merge "bridge: Change participant SFU streams when source streams change."

author Joshua Colp <jcolp@digium.com>

Thu, 21 Sep 2017 20:56:47 +0000 (15:56 -0500)

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

Thu, 21 Sep 2017 20:56:47 +0000 (15:56 -0500)
author Joshua Colp <jcolp@digium.com>
Thu, 21 Sep 2017 20:56:47 +0000 (15:56 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 21 Sep 2017 20:56:47 +0000 (15:56 -0500)
diff --cc res/res_pjsip_sdp_rtp.c
Simple merge
diff --cc res/res_pjsip_session.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Thu, 21 Sep 2017 20:56:47 +0000 (15:56 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 21 Sep 2017 20:56:47 +0000 (15:56 -0500)
		1	2
res/res_pjsip_sdp_rtp.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip_session.c	patch \|	diff1 \|	diff2 \|	blob \| history