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