summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en/options.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-19 22:36:33 +0100
committerwm4 <wm4@nowhere>2013-11-19 22:39:14 +0100
commitf197198ca3e79b923e5d0ae66fec847737ee1f41 (patch)
tree71ca40697b7e0bb0d7873d81246b82d987a92439 /DOCS/man/en/options.rst
parent04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4 (diff)
downloadmpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.bz2
mpv-f197198ca3e79b923e5d0ae66fec847737ee1f41.tar.xz
player: add --merge-files option
Diffstat (limited to 'DOCS/man/en/options.rst')
-rw-r--r--DOCS/man/en/options.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 5e67f36278..a9f0656e59 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1292,6 +1292,15 @@ OPTIONS
``--media-keys``, ``--no-media-keys``
OSX only: Enabled by default. Enables/disable media keys support.
+``--merge-files``
+ Pretend that all files passed to mpv are concatenated into a single, big
+ file. This uses timeline/EDL support internally. Note that this won't work
+ for ordered chapter files or quvi-resolved URLs (such as youtube links).
+
+ This option is interpreted at program start, and doesn't affect for
+ example files or playlists loaded with the ``loadfile`` or ``loadlist``
+ commands.
+
``--mf=<option1:option2:...>``
Used when decoding from multiple PNG or JPEG files with ``mf://``.