diff options
author | Clément Bœsch <ubitux@gmail.com> | 2011-07-07 23:41:42 +0200 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-09 04:23:24 +0300 |
commit | 2174cbfa2fd153e7a77ba5ef7167d2bf99057330 (patch) | |
tree | f22f58f4a272b99d22b939fcd4fdeb27198680a5 /input | |
parent | 6794bca0e96ac288eab7248431080afe29152564 (diff) | |
download | mpv-2174cbfa2fd153e7a77ba5ef7167d2bf99057330.tar.bz2 mpv-2174cbfa2fd153e7a77ba5ef7167d2bf99057330.tar.xz |
cleanup: silence most of the clang warnings
Diffstat (limited to 'input')
-rw-r--r-- | input/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/input/input.c b/input/input.c index 94c15f42bb..14d31775b0 100644 --- a/input/input.c +++ b/input/input.c @@ -646,7 +646,7 @@ static const m_option_t input_conf[] = { }; static const m_option_t mp_input_opts[] = { - { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + { "input", (void *)&input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, OPT_MAKE_FLAGS("joystick", input.use_joystick, CONF_GLOBAL), OPT_MAKE_FLAGS("lirc", input.use_lirc, CONF_GLOBAL), OPT_MAKE_FLAGS("lircc", input.use_lircc, CONF_GLOBAL), @@ -1487,7 +1487,7 @@ int mp_input_get_key_from_name(const char *name) { int modifiers = 0; const char *p; - while (p = strchr(name, '+')) { + while ((p = strchr(name, '+'))) { for (struct mp_key_name *m = modifier_names; m->name; m++) if (!bstrcasecmp(BSTR(m->name), (struct bstr){(char *)name, p - name})) { modifiers |= m->key; |