From: Joshua Colp <jcolp@digium.com>
Date: Mon, 30 Apr 2018 17:36:43 +0000 (-0500)
Subject: Merge "bridge_softmix: Fix sporadic incorrect video stream mapping." into 15
X-Git-Tag: 15.5.0-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e18181b06adb423842bee99abdc27898432e165d;p=thirdparty%2Fasterisk.git

Merge "bridge_softmix: Fix sporadic incorrect video stream mapping." into 15
---

e18181b06adb423842bee99abdc27898432e165d