[asterisk-commits] mmichelson: trunk r401216 - in /trunk: ./ include/asterisk/bridge.h

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Oct 18 10:29:15 2013
New Revision: 401216

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401216
Log:
Clarify in ast_bridge_destroy() about how departable channels must be handled.
........

Merged revisions 401212 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/bridge.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/include/asterisk/bridge.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/bridge.h?view=diff&rev=401216&r1=401215&r2=401216
==============================================================================
--- trunk/include/asterisk/bridge.h (original)
+++ trunk/include/asterisk/bridge.h Fri Oct 18 10:29:15 2013
@@ -409,6 +409,12 @@
  * \endcode
  *
  * This destroys a bridge that was previously created.
+ *
+ * \note
+ * While this function will kick all channels out of the bridge, channels that
+ * were added to the bridge using ast_bridge_impart() with the flag
+ * AST_BRIDGE_IMPART_CHAN_DEPARTABLE set must have ast_bridge_depart() called
+ * on them before calling ast_bridge_destroy().
  */
 int ast_bridge_destroy(struct ast_bridge *bridge, int cause);