Remove some dead code dealing with old bridging method.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394471 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 83c521d..f38eea8 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4958,11 +4958,6 @@ static int sip_setoption(struct ast_channel *chan, int option, void *data, int d
                        res = ast_rtp_instance_set_write_format(p->rtp, (struct ast_format *) data);
                }
                break;
-       case AST_OPTION_MAKE_COMPATIBLE:
-               if (p->rtp) {
-                       res = ast_rtp_instance_make_compatible(chan, p->rtp, (struct ast_channel *) data);
-               }
-               break;
        case AST_OPTION_DIGIT_DETECT:
                if ((ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_INBAND) ||
                    (ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_AUTO)) {

diff --git a/main/channel.c b/main/channel.c
index f2519c4..c6df5f8 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -6069,12 +6069,6 @@ static int ast_channel_make_compatible_helper(struct ast_channel *from, struct a
        struct ast_format best_dst_fmt;
        int use_slin;
 
-       /* See if the channel driver can natively make these two channels compatible */
-       if (ast_channel_tech(from)->bridge && ast_channel_tech(from)->bridge == ast_channel_tech(to)->bridge &&
-           !ast_channel_setoption(from, AST_OPTION_MAKE_COMPATIBLE, to, sizeof(struct ast_channel *), 0)) {
-               return 0;
-       }
-
        if ((ast_format_cmp(ast_channel_readformat(from), ast_channel_writeformat(to)) != AST_FORMAT_CMP_NOT_EQUAL) &&
                (ast_format_cmp(ast_channel_readformat(to), ast_channel_writeformat(from)) != AST_FORMAT_CMP_NOT_EQUAL)) {
                /* Already compatible!  Moving on ... */