From: Automerge script <automerge@asterisk.org>
Date: Thu, 27 Jul 2006 16:02:48 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.11-netsec~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=109237c04f1d2a2fb56843649db70d1bedc89874;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channel.c b/channel.c
index a80960e70e..b2c29b3cb5 100644
--- a/channel.c
+++ b/channel.c
@@ -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;