diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-08-03 08:43:50 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-08-03 08:43:50 -0500 |
| commit | 20ee33e22e3724c35ab3078c5032b87af5b4920c (patch) | |
| tree | 5ff17b8ac0c7e4fa448934ce312b42d45afd3c45 /channels | |
| parent | e28fbebc575065461964f5aac8246a3e5cdb9a03 (diff) | |
| parent | 89b21fd9a38bcd89402249440c1670ce48781f30 (diff) | |
Merge topic 'misc_rtp_tweaks' into 13
* changes:
rtp_engine.h: No sense allowing payload types larger than RFC allows.
rtp_engine.c: Minor tweaks.
rtp_engine.h: Misc comment fixes.
chan_sip.c: Tweak glue->update_peer() parameter nil value.
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1838bdaad..9ab429e83 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7350,7 +7350,7 @@ static int sip_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) redirect of both channels). Note that a channel can not be masqueraded *into* a native bridge. So there is no danger that this breaks a native bridge that should stay up. */ - sip_set_rtp_peer(newchan, NULL, NULL, 0, 0, 0); + sip_set_rtp_peer(newchan, NULL, NULL, NULL, NULL, 0); ret = 0; } ast_debug(3, "SIP Fixup: New owner for dialogue %s: %s (Old parent: %s)\n", p->callid, ast_channel_name(p->owner), ast_channel_name(oldchan)); |