Merge "bridge_softmix.c: Fix crash if channel fails to join mixing tech."

This commit is contained in:
zuul
2016-04-25 21:08:15 -05:00
committed by Gerrit Code Review
4 changed files with 32 additions and 3 deletions

View File

@@ -107,6 +107,9 @@ struct ast_bridge_technology {
* \retval -1 on failure
*
* \note On entry, bridge is already locked.
*
* \note The bridge technology must tollerate a failed to join channel
* until it can be kicked from the bridge.
*/
int (*join)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel);
/*!