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 /addons | |
| 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 'addons')
| -rw-r--r-- | addons/chan_ooh323.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index a393e8e0e..61d9245fe 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -117,7 +117,6 @@ static struct ast_channel_tech ooh323_tech = { .fixup = ooh323_fixup, .send_html = 0, .queryoption = ooh323_queryoption, - .bridge = ast_rtp_instance_bridge, /* XXX chan unlocked ? */ .early_bridge = ast_rtp_instance_early_bridge, .func_channel_read = function_ooh323_read, .func_channel_write = function_ooh323_write, |