From: Joshua Colp <jcolp@digium.com>
Date: Mon, 7 Nov 2016 22:01:03 +0000 (-0600)
Subject: Merge "bridges/bridge_softmix: Remove SSRC changes on join/leave; update video source"
X-Git-Tag: 15.0.0-beta1~538
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94de6b7ae4485fcec56f67d94b3b9cb767ea69c4;p=thirdparty%2Fasterisk.git

Merge "bridges/bridge_softmix: Remove SSRC changes on join/leave; update video source"
---

94de6b7ae4485fcec56f67d94b3b9cb767ea69c4