diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 1 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 4 | ||||
| -rw-r--r-- | options/options.c | 3 | ||||
| -rw-r--r-- | options/options.h | 2 | ||||
| -rw-r--r-- | video/out/vo.c | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index d47a4d9c41..f9cc1cd956 100644 --- a/DOCS/interface-changes.rst +++ b/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. diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index b3c83de4da..d93493487b 100644 --- a/DOCS/man/options.rst +++ b/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 diff --git a/options/options.c b/options/options.c index e16a3a8d7d..fdf787cbf6 100644 --- a/options/options.c +++ b/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} }; diff --git a/options/options.h b/options/options.h index 1453620c96..0dcbe0adef 100644 --- a/options/options.h +++ b/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; diff --git a/video/out/vo.c b/video/out/vo.c index 9b48ad20a7..0893202e72 100644 --- a/video/out/vo.c +++ b/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; |