summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/input.rst6
-rw-r--r--DOCS/man/options.rst13
2 files changed, 7 insertions, 12 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index b612e04b48..1bc033ea00 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -2167,12 +2167,6 @@ caveats with some properties (due to historical reasons):
Option changes at runtime are affected by this as well.
-``deinterlace``
- While video is active, this behaves differently from the option. It will
- never return the ``auto`` value (but the state as observed by the video
- chain). If you set ``auto``, the property will set this as the option value,
- and will return the actual video chain state as observed instead of auto.
-
``video-aspect``
While video is active, always returns the effective aspect ratio. Setting
a special value (like ``no``, values ``<= 0``) will make the property
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index d4b8261fb6..598fe8084c 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -966,8 +966,8 @@ Video
Works in ``--no-correct-pts`` mode only.
-``--deinterlace=<yes|no|auto>``
- Enable or disable interlacing (default: auto, which usually means no).
+``--deinterlace=<yes|no>``
+ Enable or disable interlacing (default: no).
Interlaced video shows ugly comb-like artifacts, which are visible on
fast movement. Enabling this typically inserts the yadif video filter in
order to deinterlace the video, or lets the video output apply deinterlacing
@@ -976,10 +976,11 @@ Video
This behaves exactly like the ``deinterlace`` input property (usually
mapped to ``d``).
- ``auto`` is a technicality. Strictly speaking, the default for this option
- is deinterlacing disabled, but the ``auto`` case is needed if ``yadif`` was
- added to the filter chain manually with ``--vf``. Then the core shouldn't
- disable deinterlacing just because the ``--deinterlace`` was not set.
+ Keep in mind that this **will** conflict with manually inserted
+ deinterlacing filters, unless you take care. (Since mpv 0.27.0, even the
+ hardware deinterlace filters will conflict. Also since that version,
+ ``--deinterlace=auto`` was removed, which used to mean that the default
+ interlacing option of possibly inserted video filters was used.)
``--frames=<number>``
Play/convert only first ``<number>`` video frames, then quit.