From 91a9884b7a80b599908e5cc5d237f0e6e576882f Mon Sep 17 00:00:00 2001 From: Automerge Script Date: Thu, 14 Jun 2007 21:30:45 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69391 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/channel.c b/channel.c index c76c9b7e7c..628e0614fa 100644 --- a/channel.c +++ b/channel.c @@ -2766,6 +2766,11 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe int src; int dst; + if (chan->readformat == peer->writeformat && chan->writeformat == peer->readformat) { + /* Already compatible! Moving on ... */ + return 0; + } + /* Set up translation from the chan to the peer */ src = chan->nativeformats; dst = peer->nativeformats; -- 2.47.2