Merge branch 'master' into release/current

4 files changed, 41 insertions, 6 deletions

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index d7db0106b4..f02f6588ff 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -19,6 +19,10 @@ Interface changes
 
 ::
 
+ --- mpv 0.20.0 ---
+    - add --image-display-duration option - this also means that image duration
+      is not influenced by --mf-fps anymore in the general case (this is an
+      incompatible change)
  --- mpv 0.19.0 ---
     - deprecate "balance" option/property (no replacement)
  --- mpv 0.18.1 ---
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 2cc41bf5d5..8cdba41a3d 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -526,7 +526,7 @@ Input Commands that are Possibly Subject to Change
 ``disable-section "<section>"``
     Disable the named input section. Undoes ``enable-section``.
 
-``define-section "<section>" "<contents>" [default|forced]``
+``define-section "<section>" "<contents>" [default|force]``
     Create a named input section, or replace the contents of an already existing
     input section. The ``contents`` parameter uses the same syntax as the
     ``input.conf`` file (except that using the section syntax in it is not
@@ -544,7 +544,7 @@ Input Commands that are Possibly Subject to Change
     <default> (also used if parameter omitted)
         Use a key binding defined by this section only if the user hasn't
         already bound this key to a command.
-    <forced>
+    <force>
         Always bind a key. (The input section that was made active most recently
         wins if there are ambiguities.)
 
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 39416d2a64..ec8f82349d 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -701,6 +701,8 @@ Video
     controls how much of the image is cropped. May not work with all video
     output drivers.
 
+    This option has no effect if ``--video-unscaled`` option is used.
+
 ``--video-aspect=<ratio>``
     Override video aspect ratio, in case aspect information is incorrect or
     missing in the file being played. See also ``--no-video-aspect``.
@@ -738,10 +740,12 @@ Video
     choices if you encounter video that has the wrong aspect ratio in mpv,
     but seems to be correct in other players.
 
-``--video-unscaled``
+``--video-unscaled=<no|yes|downscale-big>``
     Disable scaling of the video. If the window is larger than the video,
-    black bars are added. Otherwise, the video is cropped. The video still
-    can be influenced by the other ``--video-...`` options.
+    black bars are added. Otherwise, the video is cropped, unless the option
+    is set to ``downscale-big``, in which case the video is fit to window. The
+    video still can be influenced by the other ``--video-...`` options. This
+    option disables the effect of ``--panscan``.
 
     Note that the scaler algorithm may still be used, even if the video isn't
     scaled. For example, this can influence chroma conversion. The video will
@@ -1873,6 +1877,23 @@ Window
     file.mkv normally, then fail to open ``/dev/null``, then exit). (In
     mpv 0.8.0, ``always`` was introduced, which restores the old behavior.)
 
+``--image-display-duration=<seconds|inf>``
+    If the current file is an image, play the image for the given amount of
+    seconds (default: 1). ``inf`` means the file is kept open forever (until
+    the user stops playback manually).
+
+    Unlike ``--keep-open``, the player is not paused, but simply continues
+    playback until the time has elapsed. (It should not use any resources
+    during "playback".)
+
+    This affects image files, which are defined as having only 1 video frame
+    and no audio. The player may recognize certain non-images as images, for
+    example if ``--length`` is used to reduce the length to 1 frame, or if
+    you seek to the last frame.
+
+    This option does not affect the framerate used for ``mf://`` or
+    ``--merge-files``. For that, use ``--mf-fps`` instead.
+
 ``--force-window=<yes|no|immediate>``
     Create a video output window even if there is no video. This can be useful
     when pretending that mpv is a GUI application. Currently, the window
@@ -3650,7 +3671,7 @@ Miscellaneous
 ``--video-sync-max-audio-change=<value>``
     Maximum *additional* speed difference in percent that is applied to audio
     with ``--video-sync=display-...`` (default: 0.125). Normally, the player
-    play the audio at the speed of the video. But if the difference between
+    plays the audio at the speed of the video. But if the difference between
     audio and video position is too high, e.g. due to drift or other timing
     errors, it will attempt to speed up or slow down audio by this additional
     factor. Too low values could lead to video frame dropping or repeating if
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 0beaee59a5..c775f6dde7 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -881,6 +881,16 @@ Available video output drivers are:
 
         Windows only.
 
+    ``dcomposition=<yes|no>``
+        Allows DirectComposition when using the ANGLE backend (default: yes).
+        DirectComposition implies flip-model presentation, which can improve
+        rendering efficiency on Windows 8+ by avoiding a copy of the video frame.
+        mpv uses it by default where possible, but it can cause poor behaviour
+        with some drivers, such as a black screen or graphical corruption when
+        leaving full-screen mode. Use "no" to disable it.
+
+        Windows with ANGLE only.
+
     ``sw``
         Continue even if a software renderer is detected.