diff options
| author | wm4 <wm4@nowhere> | 2018-03-13 12:34:26 +0100 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-03-15 23:13:53 -0700 |
| commit | e42a194062cb29e538f19d12902c1610c1b30aef (patch) | |
| tree | a0594d9a300160ad2d8dc270a60ab3e753148122 /options/options.c | |
| parent | 2c572e2bb1cfa4e225a6a1599f5ecdbcf4bf2dc6 (diff) | |
| download | mpv-e42a194062cb29e538f19d12902c1610c1b30aef.tar.bz2 mpv-e42a194062cb29e538f19d12902c1610c1b30aef.tar.xz | |
vo: move display-fps internal option value to VO opts
Removes the awkward notification through VO_EVENT_WIN_STATE.
Unfortunately, some awkwardness remains in mp_property_display_fps(),
because the property has conflicting semantics with the option.
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/options/options.c b/options/options.c index 7c7a30ed27..a2322e7bb1 100644 --- a/options/options.c +++ b/options/options.c @@ -139,6 +139,7 @@ static const m_option_t mp_vo_opt_list[] = { OPT_FLAG("keepaspect-window", keepaspect_window, 0), OPT_FLAG("hidpi-window-scale", hidpi_window_scale, 0), OPT_FLAG("native-fs", native_fs, 0), + OPT_DOUBLE("display-fps", override_display_fps, M_OPT_MIN, .min = 0), OPT_DOUBLERANGE("video-timing-offset", timing_offset, 0, 0.0, 1.0), #if HAVE_X11 OPT_CHOICE("x11-netwm", x11_netwm, 0, @@ -612,8 +613,6 @@ const m_option_t mp_opts[] = { {"decoder+vo", 3})), OPT_FLAG("video-latency-hacks", video_latency_hacks, 0), - OPT_DOUBLE("display-fps", frame_drop_fps, M_OPT_MIN, .min = 0), - OPT_FLAG("untimed", untimed, 0), OPT_STRING("stream-dump", stream_dump, M_OPT_FILE), |