diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-07-16 18:49:26 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-07-16 18:49:26 +0000 |
| commit | 6ba25dd3f2db1ceb8e71e5597bfd53bce00a418b (patch) | |
| tree | b4807400279e1fd847f1b5bdf0e34bf8c3c3ce2e /main | |
| parent | 97321122611f48e005df96fc65fab754e24a27a4 (diff) | |
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/main/channel.c b/main/channel.c index f2519c40f..c6df5f8b0 100644 --- 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 ... */ |