automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-06-14 21:30:45 +00:00
parent db56721c38
commit 91a9884b7a

View File

@@ -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;