diff options
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/options/options.c b/options/options.c index 5cb5e2b522..058265ae69 100644 --- a/options/options.c +++ b/options/options.c @@ -60,7 +60,6 @@ static void print_help(struct mp_log *log) } extern const struct m_sub_options tv_params_conf; -extern const struct m_sub_options stream_pvr_conf; extern const struct m_sub_options stream_cdda_conf; extern const struct m_sub_options stream_dvb_conf; extern const struct m_sub_options stream_lavf_conf; @@ -198,6 +197,8 @@ const m_option_t mp_opts[] = { OPT_REL_TIME("end", play_end, 0), OPT_REL_TIME("length", play_length, 0), + OPT_FLAG("rebase-start-time", rebase_start_time, 0), + OPT_TIME("ab-loop-a", ab_loop[0], 0, .min = MP_NOPTS_VALUE), OPT_TIME("ab-loop-b", ab_loop[1], 0, .min = MP_NOPTS_VALUE), @@ -258,9 +259,6 @@ const m_option_t mp_opts[] = { #if HAVE_TV OPT_SUBSTRUCT("tv", tv_params, tv_params_conf, 0), #endif /* HAVE_TV */ -#if HAVE_PVR - OPT_SUBSTRUCT("pvr", stream_pvr_opts, stream_pvr_conf, 0), -#endif /* HAVE_PVR */ #if HAVE_DVBIN OPT_SUBSTRUCT("dvbin", stream_dvb_opts, stream_dvb_conf, 0), #endif @@ -306,6 +304,9 @@ const m_option_t mp_opts[] = { OPT_CHOICE_C("hwdec", hwdec_api, 0, mp_hwdec_names), OPT_CHOICE_C("hwdec-preload", vo.hwdec_preload_api, 0, mp_hwdec_names), OPT_STRING("hwdec-codecs", hwdec_codecs, 0), +#if HAVE_VIDEOTOOLBOX_HWACCEL + OPT_IMAGEFORMAT("videotoolbox-format", videotoolbox_format, 0), +#endif OPT_SUBSTRUCT("sws", vo.sws_opts, sws_conf, 0), @@ -449,7 +450,12 @@ 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), #endif +#if HAVE_WIN32 + OPT_STRING("vo-mmcss-profile", vo.mmcss_profile, M_OPT_FIXED), +#endif + OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0), OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0), @@ -694,6 +700,8 @@ const struct MPOpts mp_default_opts = { .border = 1, .WinID = -1, .window_scale = 1.0, + .x11_bypass_compositor = 1, + .mmcss_profile = "Playback", }, .allow_win_drag = 1, .wintitle = "${?media-title:${media-title}}${!media-title:No file} - mpv", @@ -763,6 +771,7 @@ const struct MPOpts mp_default_opts = { .consolecontrols = 1, .playlist_pos = -1, .play_frames = -1, + .rebase_start_time = 1, .keep_open = 0, .stream_id = { { [STREAM_AUDIO] = -1, [STREAM_VIDEO] = -1, @@ -801,6 +810,7 @@ const struct MPOpts mp_default_opts = { .screenshot_template = "mpv-shot%n", .hwdec_codecs = "h264,vc1,wmv3,hevc,mpeg2video", + .videotoolbox_format = IMGFMT_NV12, .index_mode = 1, |