diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-09-21 10:42:11 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-09-21 10:42:11 -0500 |
| commit | e5f911519d544d9822da1017c882402fa1c759e0 (patch) | |
| tree | fc605e9c3e97ae8d3cadf0d5731c9531f482d78d /include | |
| parent | c97eb951934bfb06f1625afe69185ddc8bf8ff1e (diff) | |
| parent | d884871ca7fbd50e67531ea279ff243ed104c403 (diff) | |
Merge "bridge : Fix one-way direct-media when early bridging with native_rtp" into 14
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/bridge_technology.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/bridge_technology.h b/include/asterisk/bridge_technology.h index fb275c149..8bac1e3ac 100644 --- a/include/asterisk/bridge_technology.h +++ b/include/asterisk/bridge_technology.h @@ -108,11 +108,13 @@ struct ast_bridge_technology { * * \note On entry, bridge is already locked. * - * \note The bridge technology must tollerate a failed to join channel + * \note The bridge technology must tolerate a failed to join channel * until it can be kicked from the bridge. * * \note A channel may be in a suspended state already when joining a bridge * technology. The technology must handle this case. + * + * \note A channel may not be answered when joining a bridge technology. */ int (*join)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel); /*! |