diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
| commit | 3d63833bd6c869b7efa383e8dea14be1a6eff998 (patch) | |
| tree | 34957dd051b8f67c7cc58a510e24ee3873a61ad4 /include/asterisk/framehook.h | |
| parent | e1e1cc2deefb92f8b43825f1f34e619354737842 (diff) | |
Merge in the bridge_construction branch to make the system use the Bridging API.
Breaks many things until they can be reworked. A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/framehook.h')
| -rw-r--r-- | include/asterisk/framehook.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/framehook.h b/include/asterisk/framehook.h index 52993b55c..10d525ca7 100644 --- a/include/asterisk/framehook.h +++ b/include/asterisk/framehook.h @@ -228,7 +228,7 @@ struct ast_framehook_interface { * provide it during the event and destruction callbacks. It is entirely up to the * application using this API to manage the memory associated with the data pointer. * - * \retval On success, positive id representing this hook on the channel + * \retval On success, non-negative id representing this hook on the channel * \retval On failure, -1 */ int ast_framehook_attach(struct ast_channel *chan, struct ast_framehook_interface *i); |