]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix a bug with applying the end result of the codec negotiation to the Asterisk channel.
authorJoshua Colp <jcolp@digium.com>
Thu, 23 May 2013 18:19:27 +0000 (18:19 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 23 May 2013 18:19:27 +0000 (18:19 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389567 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_sip_sdp_rtp.c

index d0af479c70de90408c4c0b087b4f7830bcf53857..a35752ad2f04592124f8085b903bc27582298bf6 100644 (file)
@@ -224,11 +224,11 @@ static int set_caps(struct ast_sip_session *session, struct ast_sip_session_medi
        if (session->channel) {
                ast_format_cap_copy(caps, ast_channel_nativeformats(session->channel));
                ast_format_cap_remove_bytype(caps, media_type);
-               ast_format_cap_append(caps, joint);
+               ast_codec_choose(&session->endpoint->prefs, joint, 1, &fmt);
+               ast_format_cap_add(caps, &fmt);
 
                /* Apply the new formats to the channel, potentially changing read/write formats while doing so */
-               ast_format_cap_append(ast_channel_nativeformats(session->channel), caps);
-               ast_codec_choose(&session->endpoint->prefs, caps, 0, &fmt);
+               ast_format_cap_copy(ast_channel_nativeformats(session->channel), caps);
                ast_format_copy(ast_channel_rawwriteformat(session->channel), &fmt);
                ast_format_copy(ast_channel_rawreadformat(session->channel), &fmt);
                ast_set_read_format(session->channel, ast_channel_readformat(session->channel));