automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@69391 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 0 deletions

diff --git a/channel.c b/channel.c
index c76c9b7e7..628e0614f 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;