automerge commit

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

diff --git a/channel.c b/channel.c
index f53f3d48f864abfe8529bf44b0e972d0767234d5..69c794c66ae55227ced00b711f6e442d4d1d330d 100644 (file)
--- 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;