diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 22:28:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 22:28:28 +0200 |
| commit | 6ca48ad044e690c43985aa380cb474f1a3df7b4e (patch) | |
| tree | 47a311223209a8edd05242cf417d6b6c61bd83b6 /libavformat/mov_chan.c | |
| parent | 54101214d89382a24518f21a30080631a981c798 (diff) | |
| parent | 5f26d4d44896542e729c7515c784d983e396106a (diff) | |
| download | ffmpeg-6ca48ad044e690c43985aa380cb474f1a3df7b4e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
amr: Cosmetic cleanup
mov_chan: Fix operator precedence by adding parentheses
doc: Add missing protocols to list of supported protocols.
tcp: Check the listen call
Conflicts:
libavformat/amr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov_chan.c')
| -rw-r--r-- | libavformat/mov_chan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index a0fbecc991..a843e318c4 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -492,7 +492,7 @@ uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id, /* find the layout tag for the specified channel layout */ for (i = 0; layouts[i] != 0; i++) { - if (layouts[i] & 0xFFFF != channels) + if ((layouts[i] & 0xFFFF) != channels) continue; for (j = 0; layout_map[j].tag != 0; j++) { if (layout_map[j].tag == layouts[i] && |