summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-05-08 07:33:07 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-05-08 07:33:07 -0500
commit552e6d81efa7871f9f155b39ae8a842b423ad3e9 (patch)
tree84da1dc9253e07b0abaef8ad24baa26248819fad /include
parent000183415717adae0c5ce1dd015213e7ee286dd4 (diff)
parentc90d81ef5195c71db81ed69782d84ab357787516 (diff)
Merge "bridge: Fix returning to dialplan when executing Bridge() from AMI."
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/channel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 889d3ff07..fd339d974 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -4640,6 +4640,9 @@ struct ast_bridge_channel *ast_channel_get_bridge_channel(struct ast_channel *ch
*
* \note absolutely _NO_ channel locks should be held before calling this function.
*
+ * \note The dialplan location on the returned channel is where the channel
+ * should be started in the dialplan if it is returned to it.
+ *
* \param yankee The channel to gain control of
* \retval NULL Could not gain control of the channel
* \retval non-NULL The channel