Merged revisions 38310 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38310 | kpfleming | 2006-07-26 21:43:49 -0500 (Wed, 26 Jul 2006) | 2 lines

don't do useless translation destroy/build when the channel is already in the correct format

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@38311 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 0 deletions

diff --git a/channel.c b/channel.c
index 5ee36290b..a2ac46ff9 100644
--- a/channel.c
+++ b/channel.c
@@ -2472,6 +2472,10 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo
 	/* Make sure we only consider audio */
 	fmt &= AST_FORMAT_AUDIO_MASK;
 	
+	/* 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)