From f197198ca3e79b923e5d0ae66fec847737ee1f41 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 19 Nov 2013 22:36:33 +0100
Subject: player: add --merge-files option

---
 DOCS/man/en/options.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'DOCS')

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://``.
 
-- 
cgit v1.2.3