From 8f2ccba71bb44cceb43436cbbabd6e42fc71925c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 22 Aug 2017 19:08:07 +0200 Subject: video: change --deinterlace behavior This removes all GPL only code from it, and that's the whole purpose. Also happens to be much simpler. The "deinterlace" option still sort of exists, but only as runtime changeable option. The main change in behavior is that the property will not report back the actual deint state. Or in other words, if inserting or initializing the filter fails, the deinterlace property will still return "yes". This is in line with most recent behavior changes to properties and options. --- DOCS/man/options.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'DOCS/man/options.rst') 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=`` - Enable or disable interlacing (default: auto, which usually means no). +``--deinterlace=`` + 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=`` Play/convert only first ```` video frames, then quit. -- cgit v1.2.3