diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-09 21:02:51 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-09 21:02:51 +0000 |
commit | 22cfd308d6414aa91b04b2df6eb3d6d7bdc2889d (patch) | |
tree | 8d67698fcc003341d43d36e203d45cd0ba147d1d /channel.c | |
parent | 4348937a66e1b45fff8f0bedafbf19663e268cc9 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42620 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |