From: Automerge script <automerge@asterisk.org>
Date: Sat, 25 Feb 2006 20:04:12 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.5-netsec~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bc176e6b82702ac18ffe4bb5ccbf8351ec6c841;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/translate.c b/translate.c
index 306774d78f..799a4440d4 100644
--- a/translate.c
+++ b/translate.c
@@ -471,8 +471,10 @@ int ast_translator_best_choice(int *dst, int *srcs)
 		/* We will need to translate */
 		ast_mutex_lock(&list_lock);
 		for (y = 0; y < MAX_FORMAT; y++) {
-			if (!(cur & *dst))
+			if (!(cur & *dst)) {
+				cur = cur << 1;
 				continue;
+			}
 
 			for (x = 0; x < MAX_FORMAT; x++) {
 				if ((*srcs & (1 << x)) &&			/* x is a valid source format */