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

automerge commit

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

diff --git a/channel.c b/channel.c
index dc33e8a573..a80960e70e 100644
--- a/channel.c
+++ b/channel.c
@@ -2328,6 +2328,10 @@ 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)