diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-09 20:24:19 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-09 20:24:19 +0000 |
commit | 973580ded1ceb0dd68e40182dffec907d1d6c4a8 (patch) | |
tree | 576de428afe2b528dabefa783fbe41e7925b0358 /channel.c | |
parent | 5f2ffca9a2e72bd4d95db5520b59ecfda6508e9e (diff) |
Only truly consider the channel in the same format if the format matches the raw format OR if a translation path already exists to translate between them. (issue #7887 reported by softins & issue #7803 reported by alvaro_palma_aste). Thanks goes to stubert for giving me access to a box and showing me a scenario where this occured.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@42600 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; |