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 dc33e8a573284b53d529bbc227eb10a1273e90ac..a80960e70e67f4017ac0b7e05f557750e6b856f1 100644 (file)
--- 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)