diff options
| author | wm4 <wm4@nowhere> | 2015-03-04 11:43:02 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-04 17:28:41 +0100 |
| commit | 85bf102f54cfae9945d26f1edc0e642975881dfa (patch) | |
| tree | 44a8805640644b30db8d7327314e0b19d5abe999 /video | |
| parent | 0bbf36b796336c41ce8a7ef2054276254ba56067 (diff) | |
| download | mpv-85bf102f54cfae9945d26f1edc0e642975881dfa.tar.bz2 mpv-85bf102f54cfae9945d26f1edc0e642975881dfa.tar.xz | |
win32: fix some more -Wparentheses warnings
Stupid compiler.
For decode_surrogate_pair(), I changed the order of evaluation; it
shouldn't matter, but this order is more readable in my opinion.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/vo_direct3d.c | 2 | ||||
| -rw-r--r-- | video/out/w32_common.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index bf24d164c8..1977d64a11 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -964,7 +964,7 @@ render_osd: // Return the high byte of the value that represents white in chroma (U/V) static int get_chroma_clear_val(int bit_depth) { - return 1 << (bit_depth - 1 & 7); + return 1 << ((bit_depth - 1) & 7); } // this macro is supposed to work on all formats supported by 3D rendering, and diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 1d82825294..12c37b5f0d 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -403,7 +403,7 @@ static int mod_state(struct vo_w32_state *w32) static int decode_surrogate_pair(wchar_t lead, wchar_t trail) { - return 0x10000 + ((lead & 0x3ff) << 10) | (trail & 0x3ff); + return 0x10000 + (((lead & 0x3ff) << 10) | (trail & 0x3ff)); } static int decode_utf16(struct vo_w32_state *w32, wchar_t c) |