kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +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@38364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-07-27 16:02:48 +00:00
parent 4dc5c42b30
commit 109237c04f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channel.c
View File

@@ -2328,10 +2328,6 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo
int native;
int res;
/* if already in the desired format nothing to do here */
if (*format == fmt)
return 0;
native = chan->nativeformats;
/* Find a translation path from the native format to one of the desired formats */
if (!direction)
@@ -2349,6 +2345,13 @@ 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)) {
/* the channel is already in these formats, so nothing to do */
ast_mutex_unlock(&chan->lock);
return 0;
}
*rawformat = native;
/* User perspective is fmt */
*format = fmt;