github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-14 22:48:35 +01:00
Code Releases Activity

win32: fix some more -Wparentheses warnings

Browse Source 
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 85bf102f54)
This commit is contained in:
wm4 2015-03-04 11:43:02 +01:00 committed by Diogo Franco (Kovensky)
parent 21a90cc49c
commit 3d3b1b8bba
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
options/path.c
View File

@ -240,7 +240,7 @@ char *mp_path_join(void *talloc_ctx, struct bstr p1, struct bstr p2)
return bstrdup0(talloc_ctx, p1);
#if HAVE_DOS_PATHS
if (p2.len >= 2 && p2.start[1] == ':'
if ((p2.len >= 2 && p2.start[1] == ':')
|| p2.start[0] == '\\' || p2.start[0] == '/')
#else
if (p2.start[0] == '/')
@ -251,7 +251,7 @@ char *mp_path_join(void *talloc_ctx, struct bstr p1, struct bstr p2)
int endchar1 = p1.start[p1.len - 1];
#if HAVE_DOS_PATHS
have_separator = endchar1 == '/' || endchar1 == '\\'
|| p1.len == 2 && endchar1 == ':'; // "X:" only
|| (p1.len == 2 && endchar1 == ':'); // "X:" only
#else
have_separator = endchar1 == '/';
#endif

2
video/out/vo_direct3d.c
View File

@ -940,7 +940,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

2
video/out/w32_common.c
View File

@ -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)