diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-09 20:25:45 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-09 20:25:45 +0000 |
| commit | a3f259c971d310902bdc3300ca32e3c6ed9a36fb (patch) | |
| tree | f3601ca6f2724fa3dc64df6206d884a61411e0f4 /main | |
| parent | 858ae616c94faa835eb0d9afa6f698b1e2b46b3b (diff) | |
Merged revisions 42600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r42600 | file | 2006-09-09 16:24:19 -0400 (Sat, 09 Sep 2006) | 2 lines
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/trunk@42601 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 908e8c08c..24fe88a25 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2614,7 +2614,7 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo /* Now we have a good choice for both. */ ast_channel_lock(chan); - 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_channel_unlock(chan); return 0; |