automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69391 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index c76c9b7e7cc53eb56bfe27df421050b1b6c169d1..628e0614fa7593d661d8c3f1a36559c42568c826 100644 (file)
--- 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;