summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-05-15 09:28:11 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-05-15 09:28:11 -0500
commit094093b31dd8ab55d481b72d469b917e49794dbf (patch)
tree8b947992713ba82ca8c6404674d4237bfb3ee244 /channels
parentce4d8dac91631599452a9c7aa9c81001704afb62 (diff)
parent93b7f84c1ac61208607ec6f7360b594dee921a1b (diff)
Merge "chan_sip: Change sip_get_codec() to return correct codec list"
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e7c15bcbd..930dc0f67 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -33588,9 +33588,7 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i
static void sip_get_codec(struct ast_channel *chan, struct ast_format_cap *result)
{
- struct sip_pvt *p = ast_channel_tech_pvt(chan);
-
- ast_format_cap_append_from_cap(result, !ast_format_cap_count(p->peercaps) ? p->caps : p->peercaps, AST_MEDIA_TYPE_UNKNOWN);
+ ast_format_cap_append_from_cap(result, ast_channel_nativeformats(chan), AST_MEDIA_TYPE_UNKNOWN);
}
static struct ast_rtp_glue sip_rtp_glue = {