diff options
| author | wm4 <wm4@nowhere> | 2015-03-02 19:09:25 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-02 19:09:25 +0100 |
| commit | 445b3fbf826dd074b1f2a34cddcd3f126462f0d1 (patch) | |
| tree | 29b51fb3eaa7a2f23d120a265c4f1cc0a1afef1c /demux/demux_mkv.c | |
| parent | 4b177bd5c22fbeeba9ddae77503ab9938f2503c3 (diff) | |
| download | mpv-445b3fbf826dd074b1f2a34cddcd3f126462f0d1.tar.bz2 mpv-445b3fbf826dd074b1f2a34cddcd3f126462f0d1.tar.xz | |
buid: readd -Wparentheses
This warning wasn't overly helpful in the past, and warned against
perfectly fine code. But at least with recent gcc versions, this is the
warning that complains about assignments in if expressions (why???), so
we want to enable it.
Also change all the code this warning complains about for no reason.
Diffstat (limited to 'demux/demux_mkv.c')
| -rw-r--r-- | demux/demux_mkv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index df7de3ef5e..d19d50aab1 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1990,8 +1990,8 @@ static bool handle_realaudio(demuxer_t *demuxer, mkv_track_t *track, uint8_t ov = track->audio_buf[o / 2]; int x = (i & 1) ? iv >> 4 : iv & 0x0F; int y = (o & 1) ? ov >> 4 : ov & 0x0F; - track->audio_buf[o / 2] = ov & 0x0F | (o & 1 ? x << 4 : x); - track->audio_buf[i / 2] = iv & 0x0F | (i & 1 ? y << 4 : y); + track->audio_buf[o / 2] = (ov & 0x0F) | (o & 1 ? x << 4 : x); + track->audio_buf[i / 2] = (iv & 0x0F) | (i & 1 ? y << 4 : y); i++; o++; } |