diff options
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/options/options.c b/options/options.c index 1ae48a6fc2..bb2ccb5220 100644 --- a/options/options.c +++ b/options/options.c @@ -82,12 +82,14 @@ extern const struct m_obj_list ao_obj_list; const struct m_opt_choice_alternatives mp_hwdec_names[] = { {"no", HWDEC_NONE}, {"auto", HWDEC_AUTO}, + {"auto-copy", HWDEC_AUTO_COPY}, {"vdpau", HWDEC_VDPAU}, {"videotoolbox",HWDEC_VIDEOTOOLBOX}, {"vaapi", HWDEC_VAAPI}, {"vaapi-copy", HWDEC_VAAPI_COPY}, {"dxva2", HWDEC_DXVA2}, {"dxva2-copy", HWDEC_DXVA2_COPY}, + {"d3d11va", HWDEC_D3D11VA}, {"d3d11va-copy",HWDEC_D3D11VA_COPY}, {"rpi", HWDEC_RPI}, {"mediacodec", HWDEC_MEDIACODEC}, @@ -373,7 +375,7 @@ const m_option_t mp_opts[] = { OPT_CHOICE("ass-shaper", ass_shaper, 0, ({"simple", 0}, {"complex", 1})), OPT_CHOICE("ass-style-override", ass_style_override, 0, - ({"no", 0}, {"yes", 1}, {"force", 3}, {"signfs", 4})), + ({"no", 0}, {"yes", 1}, {"force", 3}, {"signfs", 4}, {"strip", 5})), OPT_FLAG("sub-scale-by-window", sub_scale_by_window, 0), OPT_FLAG("sub-scale-with-window", sub_scale_with_window, 0), OPT_FLAG("ass-scale-with-window", ass_scale_with_window, 0), @@ -396,8 +398,10 @@ const m_option_t mp_opts[] = { OPT_FLAG("audio-fallback-to-null", ao_null_fallback, 0), OPT_CHOICE("force-window", force_vo, 0, ({"no", 0}, {"yes", 1}, {"immediate", 2})), + OPT_FLAG("taskbar-progress", vo.taskbar_progress, 0), OPT_FLAG("ontop", vo.ontop, M_OPT_FIXED), OPT_FLAG("border", vo.border, M_OPT_FIXED), + OPT_FLAG("fit-border", vo.fit_border, M_OPT_FIXED), OPT_FLAG("on-all-workspaces", vo.all_workspaces, M_OPT_FIXED), OPT_FLAG("window-dragging", allow_win_drag, CONF_GLOBAL), @@ -458,7 +462,8 @@ const m_option_t mp_opts[] = { #if HAVE_X11 OPT_CHOICE("x11-netwm", vo.x11_netwm, 0, ({"auto", 0}, {"no", -1}, {"yes", 1})), - OPT_FLAG("x11-bypass-compositor", vo.x11_bypass_compositor, 0), + OPT_CHOICE("x11-bypass-compositor", vo.x11_bypass_compositor, 0, + ({"no", 0}, {"yes", 1}, {"fs-only", 2}, {"never", 3})), #endif #if HAVE_WIN32 OPT_STRING("vo-mmcss-profile", vo.mmcss_profile, M_OPT_FIXED), @@ -706,10 +711,12 @@ const struct MPOpts mp_default_opts = { .panscan = 0.0f, .keepaspect = 1, .keepaspect_window = 1, + .taskbar_progress = 1, .border = 1, + .fit_border = 1, .WinID = -1, .window_scale = 1.0, - .x11_bypass_compositor = 0, + .x11_bypass_compositor = 2, .mmcss_profile = "Playback", }, .allow_win_drag = 1, |