[asterisk-commits] rmudgett: trunk r394471 - in /trunk: channels/chan_sip.c main/channel.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Jul 16 13:49:26 2013
New Revision: 394471

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394471
Log:
Remove some dead code dealing with old bridging method.

Modified:
    trunk/channels/chan_sip.c
    trunk/main/channel.c

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=394471&r1=394470&r2=394471
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jul 16 13:49:26 2013
@@ -4958,11 +4958,6 @@
 			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)) {

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=394471&r1=394470&r2=394471
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Jul 16 13:49:26 2013
@@ -6068,12 +6068,6 @@
 	struct ast_format best_src_fmt;
 	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)) {