aboutsummaryrefslogtreecommitdiffstats
path: root/translate.c
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-25 20:04:12 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-25 20:04:12 +0000
commit06a825bbef118d3c0bbed11e532cd3f06564faa2 (patch)
tree32583c157892df253e109a5c406ecdeebc389624 /translate.c
parentb75cb89c9fbc1d9b84b33957fa8876f252ce55ae (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@11145 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'translate.c')
-rw-r--r--translate.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/translate.c b/translate.c
index 306774d78..799a4440d 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 */