From b2b2ea590104faef85685103ec19db6a6e632256 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Sat, 9 Sep 2006 21:02:51 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42620 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channel.c b/channel.c index f53f3d48f8..69c794c66a 100644 --- a/channel.c +++ b/channel.c @@ -2385,7 +2385,7 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo /* Now we have a good choice for both. */ ast_mutex_lock(&chan->lock); - if ((*rawformat == native) && (*format == fmt)) { + if ((*rawformat == native) && (*format == fmt) && ((*rawformat == *format) || (*trans))) { /* the channel is already in these formats, so nothing to do */ ast_mutex_unlock(&chan->lock); return 0;