summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/en/changes.rst3
-rw-r--r--DOCS/man/en/encode.rst5
-rw-r--r--DOCS/man/en/options.rst32
-rw-r--r--DOCS/man/en/vo.rst3
4 files changed, 26 insertions, 17 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index c1d924e224..de3b24b710 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -64,7 +64,7 @@ General changes for mplayer2 to mpv
* Encoding functionality (replacement for mencoder, see ``DOCS/encoding.rst``)
* Remove ``--vo=gif89a``, ``--vo=md5sum``, ``--vo=yuv4mpeg``, as encoding can
handle these use cases. For yuv4mpeg, for example, use:
- ``mpv input.mkv -o output.y4m --no-audio``.
+ ``mpv input.mkv -o output.y4m --no-audio --oautofps --oneverdrop``.
* Image subtitles (DVDs etc.) are rendered in color and use more correct
positioning (color can be disabled with ``--sub-gray``)
* General code cleanups
@@ -127,6 +127,7 @@ Command line switches
-a52drc level --ad-lavc-ac3drc=level
-dumpstream --stream-dump=<filename>
-capture --stream-capture=<filename>
+ -stop-xscreensaver --stop-screensaver
=================================== ===================================
*NOTE*: ``-opt val`` becomes ``--opt=val``.
diff --git a/DOCS/man/en/encode.rst b/DOCS/man/en/encode.rst
index 93b1b84f28..0676cb1479 100644
--- a/DOCS/man/en/encode.rst
+++ b/DOCS/man/en/encode.rst
@@ -45,6 +45,11 @@ You can encode files from one format/codec to another using this facility.
specified - use --ofps or --oautofps to force CFR encoding in these
cases.
+--omaxfps=<float value>
+ Specifies the minimum distance of adjacent frames (default: 0, which means
+ unset). Content of lower frame rate is not readjusted to this frame rate;
+ content of higher frame rate is decimated to this frame rate.
+
--oharddup
If set, the frame rate given by --ofps is attained not by skipping time
codes, but by duplicating frames (constant frame rate mode).
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 3aa94ff33e..304eeba464 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1,7 +1,3 @@
---abs=<value>
- (``--ao=oss`` only) (OBSOLETE)
- Override audio driver/card buffer size detection.
-
--ad=<[+|-]family1:(*|decoder1),[+|-]family2:(*|decoder2),...[-]>
Specify a priority list of audio decoders to be used, according to their
family and decoder name. Entries like ``family:*`` prioritize all decoders
@@ -790,7 +786,7 @@
``-vo=null``).
This can be "misused" to disable screensavers that do not support the
- proper X API (see also ``--stop-xscreensaver``). If you think this is too
+ proper X API (see also ``--stop-screensaver``). If you think this is too
complicated, ask the author of the screensaver program to support the
proper X APIs.
@@ -1800,6 +1796,12 @@
to write a screenshot. Too high compression might occupy enough CPU time to
interrupt playback. The default is 7.
+--screenshot-png-filter=<0-5>
+ Set the filter applied prior to PNG compression. 0 is none, 1 is "sub", 2 is
+ "up", 3 is "average", 4 is "Paeth", and 5 is "mixed". This affects the level
+ of compression that can be achieved. For most images, "mixed" achieves the
+ best compression ratio, hence it is the default.
+
--screenshot-template=<template>
Specify the filename template used to save screenshots. The template
specifies the filename without file extension, and can contain format
@@ -1982,18 +1984,13 @@
*NOTE*: without ``--hr-seek``, skipping will snap to keyframes.
---stereo=<mode>
- Select type of MP2/MP3 stereo output.
+--stop-screensaver, --no-stop-screensaver
+ Turns off the screensaver (or screen blanker and similar mechanisms) at
+ startup and turns it on again on exit. (Default: yes)
- :0: stereo
- :1: left channel
- :2: right channel
-
---stop-xscreensaver
- (X11 only)
- Turns off xscreensaver at startup and turns it on again on exit. If your
- screensaver supports neither the XSS nor XResetScreenSaver API please use
- ``--heartbeat-cmd`` instead.
+ This is not supported on all video outputs or platforms. Sometimes it is
+ implemented, but doesn't work (happens often on GNOME). You might be able
+ to to work this around using ``--heartbeat-cmd`` instead.
--sub=<subtitlefile1,subtitlefile2,...>
Use/display these subtitle files. Only one file can be displayed at the
@@ -2127,6 +2124,9 @@
Set the window title. Properties are expanded on playback start.
(See property_expansion_.)
+ *NOTE*: There is a danger of this causing significant CPU usage,
+ depending on the properties used and the window manager.
+
--tv=<option1:option2:...>
This option tunes various properties of the TV capture module. For
watching TV with mpv, use ``tv://`` or ``tv://<channel_number>`` or
diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst
index 251e71ce03..079e146f8a 100644
--- a/DOCS/man/en/vo.rst
+++ b/DOCS/man/en/vo.rst
@@ -708,6 +708,9 @@ image
png-compression=<0-9>
PNG compression factor (speed vs. file size tradeoff) (default: 7)
+ png-filter=<0-5>
+ Filter applied prior to PNG compression (0 = none; 1 = sub; 2 = up;
+ 3 = average; 4 = Paeth; 5 = mixed) (default: 5)
jpeg-quality=<0-100>
JPEG quality factor (default: 90)
[no-]jpeg-progressive