options: rename --override-display-fps to --display-fps-override

Other similar options are in the form of --foo-override not
--override-foo. The display-fps one was backwards so flip it around the
other way for consistency reasons.

DOCS/interface-changes.rst

@@ -102,6 +102,7 @@ Interface changes
     - deprecate `--cdda-toc-bias` option, offsets are always checked now
     - disable `--allow-delayed-peak-detect` by default
     - rename `--fps` to `--container-fps-override`
+    - rename `--override-display-fps` to `--display-fps-override`
  --- mpv 0.36.0 ---
     - add `--target-contrast`
     - Target luminance value is now also applied when ICC profile is used.

DOCS/man/options.rst

@@ -1179,7 +1179,7 @@ Video
       frame, so if this is not done, there is some likeliness that the VO has
       to drop some frames if rendering the first frame takes longer than needed.
 
-``--override-display-fps=<fps>``
+``--display-fps-override=<fps>``
     Set the display FPS used with the ``--video-sync=display-*`` modes. By
     default, a detected value is used. Keep in mind that setting an incorrect
     value (even if slightly incorrect) can ruin video playback. On multi-monitor
@@ -5573,7 +5573,7 @@ them.
     require driver-specific hacks if using multiple monitors, to ensure mpv
     syncs to the right one. Compositing window managers can also lead to bad
     results, as can missing or incorrect display FPS information (see
-    ``--override-display-fps``).
+    ``--display-fps-override``).
 
 ``--vulkan-device=<device name|UUID>``
     The name or UUID of the Vulkan device to use for rendering and presentation. Use

options/options.c

@@ -164,7 +164,7 @@ static const m_option_t mp_vo_opt_list[] = {
     {"keepaspect-window", OPT_BOOL(keepaspect_window)},
     {"hidpi-window-scale", OPT_BOOL(hidpi_window_scale)},
     {"native-fs", OPT_BOOL(native_fs)},
-    {"override-display-fps", OPT_DOUBLE(override_display_fps),
+    {"display-fps-override", OPT_DOUBLE(display_fps_override),
         M_RANGE(0, DBL_MAX)},
     {"video-timing-offset", OPT_DOUBLE(timing_offset), M_RANGE(0.0, 1.0)},
     {"video-sync", OPT_CHOICE(video_sync,
@@ -217,6 +217,7 @@ static const m_option_t mp_vo_opt_list[] = {
     {"android-surface-size", OPT_SIZE_BOX(android_surface_size)},
 #endif
     {"swapchain-depth", OPT_INT(swapchain_depth), M_RANGE(1, 8)},
+    {"override-display-fps", OPT_REPLACED("display-fps-override")},
     {0}
 };
 

options/options.h

@@ -69,7 +69,7 @@ typedef struct mp_vo_opts {
     char *mmcss_profile;
     int window_corners;
 
-    double override_display_fps;
+    double display_fps_override;
     double timing_offset;
     int video_sync;
 

video/out/vo.c

@@ -565,7 +565,7 @@ static void update_display_fps(struct vo *vo)
         in->reported_display_fps = fps;
     }
 
-    double display_fps = vo->opts->override_display_fps;
+    double display_fps = vo->opts->display_fps_override;
     if (display_fps <= 0)
         display_fps = in->reported_display_fps;