diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 01:22:31 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 01:22:31 +0000 |
| commit | 9bf377379c617fb04180d108360c9df50ee8c0d4 (patch) | |
| tree | 877ae228e081022814bf150500d32c57bebb77fd /main | |
| parent | dd3ab12213499cf5fe3657cd9e7f6e06d58d9271 (diff) | |
Merged revisions 208924 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r208924 | jpeeler | 2009-07-26 20:20:37 -0500 (Sun, 26 Jul 2009) | 9 lines
Merged revisions 208923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r208923 | jpeeler | 2009-07-26 20:18:31 -0500 (Sun, 26 Jul 2009) | 2 lines
Fix logic errors from 208746
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@208926 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/translate.c b/main/translate.c index 3f092d994..648b718e4 100644 --- a/main/translate.c +++ b/main/translate.c @@ -855,7 +855,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src destination format. */ for (x = 1; src_audio && (x & AST_FORMAT_AUDIO_MASK); x <<= 1) { /* if this is not a desired format, nothing to do */ - if ((!dest) & x) + if (!(dest & x)) continue; /* if the source is supplying this format, then @@ -881,7 +881,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src destination format. */ for (; src_video && (x & AST_FORMAT_VIDEO_MASK); x <<= 1) { /* if this is not a desired format, nothing to do */ - if ((!dest) & x) + if (!(dest & x)) continue; /* if the source is supplying this format, then |