diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-25 06:25:30 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-25 06:25:30 +0000 |
| commit | e5d6fd05a08bf3d079d957ff50f9a2f1dd2666a7 (patch) | |
| tree | 86e4a8a4f22109110e3cf941c6f4aa61063bf69e /main | |
| parent | 8967cd36e07490f5292d87388f9a5b4a971a4052 (diff) | |
Merged revisions 208749 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r208749 | jpeeler | 2009-07-25 01:23:18 -0500 (Sat, 25 Jul 2009) | 13 lines
Merged revisions 208746 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r208746 | jpeeler | 2009-07-25 01:19:50 -0500 (Sat, 25 Jul 2009) | 7 lines
Fix compiling under dev-mode with gcc 4.4.0.
Mostly trivial changes, but I did not know of any other way to fix the
"dereferencing type-punned pointer will break strict-aliasing rules" error
without creating a tmp variable in chan_skinny.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@208754 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 05aeaacea..3f092d994 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 |