diff options
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/bitmap_packer.c | 2 | ||||
| -rw-r--r-- | video/out/vo_sdl.c | 2 | ||||
| -rw-r--r-- | video/out/vo_vdpau.c | 2 | ||||
| -rw-r--r-- | video/out/wayland_common.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c index 78af8e648c..747693b089 100644 --- a/video/out/bitmap_packer.c +++ b/video/out/bitmap_packer.c @@ -57,7 +57,7 @@ static int size_index(int s) { int n = av_log2_16bit(s); return (n << HEIGHT_SORT_BITS) - + (- 1 - (s << HEIGHT_SORT_BITS >> n) & (1 << HEIGHT_SORT_BITS) - 1); + + ((- 1 - (s << HEIGHT_SORT_BITS >> n)) & ((1 << HEIGHT_SORT_BITS) - 1)); } /* Pack the given rectangles into an area of size w * h. diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index 9a06f2e3c4..8bde820b38 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -575,7 +575,7 @@ static int wait_events(struct vo *vo, int64_t until_time_us) if (sdl_mod & (KMOD_LCTRL | KMOD_RCTRL)) mpv_mod |= MP_KEY_MODIFIER_CTRL; if ((sdl_mod & KMOD_LALT) || - (sdl_mod & KMOD_RALT) && !mp_input_use_alt_gr(vo->input_ctx)) + ((sdl_mod & KMOD_RALT) && !mp_input_use_alt_gr(vo->input_ctx))) mpv_mod |= MP_KEY_MODIFIER_ALT; if (sdl_mod & (KMOD_LGUI | KMOD_RGUI)) mpv_mod |= MP_KEY_MODIFIER_META; diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 4c08786b0b..89bbb142a3 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -778,7 +778,7 @@ static int flip_page_timed(struct vo *vo, int64_t pts_us, int duration) if (pts < vsync + vc->vsync_interval / 4 && (vsync - PREV_VSYNC(vc->last_queue_time) > pts - vc->last_ideal_time + vc->vsync_interval / 2 - || vc->dropped_frame && vsync > vc->dropped_time)) + || (vc->dropped_frame && vsync > vc->dropped_time))) pts -= vc->vsync_interval / 2; vc->dropped_time = ideal_pts; diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 2d09ad12b0..224a60d1e0 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -418,7 +418,7 @@ static void pointer_handle_button(void *data, { struct vo_wayland_state *wl = data; - mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN0 + (button - BTN_LEFT) | + mp_input_put_key(wl->vo->input_ctx, (MP_MOUSE_BTN0 + (button - BTN_LEFT)) | ((state == WL_POINTER_BUTTON_STATE_PRESSED) ? MP_KEY_STATE_DOWN : MP_KEY_STATE_UP)); |