automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
21 years ago · 0bc176e6b8
parent b9b4ae4c34
commit 0bc176e6b8
1 changed files with 3 additions and 1 deletions
--- 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 */