diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2009-07-25 06:23:18 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2009-07-25 06:23:18 +0000 |
| commit | b7cfe904044679724cb43ca1d366c68bbbf6d1c7 (patch) | |
| tree | 91a70685b87c5838044902305673f87bad4f414c /main/translate.c | |
| parent | 742f0b90dd998f4d0969efdc4490e5be1d3dc779 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@208749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/translate.c')
| -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 fea809762..4ac502476 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 |