From e42a194062cb29e538f19d12902c1610c1b30aef Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 13 Mar 2018 12:34:26 +0100
Subject: 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.
---
 options/options.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'options/options.c')

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),
-- 
cgit v1.2.3