summaryrefslogtreecommitdiffstats
path: root/video/out/w32_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-04 11:43:02 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-03-05 10:47:14 +0900
commit3d3b1b8bbaf5e14703ed632bb5069c052149d867 (patch)
tree3a953d4e073c1328ece6cdea0a7dac5d4c9a56e6 /video/out/w32_common.c
parent21a90cc49c6e71da9d52451015297afe42cd8b6e (diff)
downloadmpv-3d3b1b8bbaf5e14703ed632bb5069c052149d867.tar.bz2
mpv-3d3b1b8bbaf5e14703ed632bb5069c052149d867.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. (cherry picked from commit 85bf102f54cfae9945d26f1edc0e642975881dfa)
Diffstat (limited to 'video/out/w32_common.c')
-rw-r--r--video/out/w32_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index b788054070..4959b39bca 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)