diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-05 21:07:01 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-05 21:07:01 +0000 |
| commit | f5c91609e55f936b081b63da469fce158b791e7a (patch) | |
| tree | c766d5632d8dd3aab0b07eab73a3e85a960fb67a /channels/chan_h323.c | |
| parent | 70fec405ccca212eb35a9e32cead289f539ddc16 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@25055 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_h323.c')
| -rw-r--r-- | channels/chan_h323.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 469ce398e..ee0bdbd1d 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -1233,7 +1233,6 @@ void setup_rtp_connection(unsigned call_reference, const char *remoteIp, int rem */ void connection_made(unsigned call_reference, const char *token) { - struct ast_channel *c = NULL; struct oh323_pvt *pvt; if (h323debug) @@ -1435,7 +1434,6 @@ int setup_outgoing_call(call_details_t *cd) */ void chan_ringing(unsigned call_reference, const char *token) { - struct ast_channel *c = NULL; struct oh323_pvt *pvt; if (h323debug) @@ -2281,7 +2279,7 @@ static char *convertcap(int cap) } } -static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs) +static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs, int nat_active) { /* XXX Deal with Video */ struct oh323_pvt *pvt; @@ -2310,7 +2308,7 @@ static struct ast_rtp_protocol oh323_rtp = { .type = type, .get_rtp_info = oh323_get_rtp_peer, .get_vrtp_info = oh323_get_vrtp_peer, - .set_rtp_peer= oh323_set_rtp_peer, + .set_rtp_peer = oh323_set_rtp_peer, }; int load_module() |