diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index 1958fb45ca..4e3dc875cb 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -549,7 +549,7 @@ static int preinit(const char *arg) /** @brief libvo Callback: Handle control requests. * @return VO_TRUE on success, VO_NOTIMPL when not implemented */ -static int control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data) { switch (request) { case VOCTRL_QUERY_FORMAT: diff --git a/libvo/w32_common.c b/libvo/w32_common.c index fd1fe5c36b..7f25182387 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -3,6 +3,8 @@ #include #include +// To get "#define vo_ontop global_vo->opts->vo_ontop" etc +#include "old_vo_defines.h" #include "osdep/keycodes.h" #include "input/input.h" #include "input/mouse.h" @@ -11,8 +13,6 @@ #include "aspect.h" #include "w32_common.h" #include "mp_fifo.h" -// To get "#define vo_ontop global_vo->opts->vo_ontop" etc -#include "old_vo_defines.h" extern int enable_mouse_movements;