kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-09 21:02:51 +00:00
parent 558c7ade17
commit b2b2ea5901
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channel.c
View File

@@ -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. */ /* Now we have a good choice for both. */
ast_mutex_lock(&chan->lock); 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 */ /* the channel is already in these formats, so nothing to do */
ast_mutex_unlock(&chan->lock); ast_mutex_unlock(&chan->lock);
return 0; return 0;