automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38327 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 0 deletions

diff --git a/channel.c b/channel.c
index dc33e8a57..a80960e70 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)