From 297fdcc0955f70ff03bbd07a6d23550159a41b62 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 20 Feb 2016 16:22:15 +0100
Subject: demux_timeline: fix nested timelines

You can e.g. reference ordered chapters or other EDL files in EDLs.
There were some bugs left which broke this in some cases.
---
 DOCS/man/options.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'DOCS/man/options.rst')

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index dc4dd0f361..bb69090583 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -394,8 +394,7 @@ Program Behavior
 
 ``--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.
+    file. This uses timeline/EDL support internally.
 
 ``--no-resume-playback``
     Do not restore playback position from the ``watch_later`` configuration
-- 
cgit v1.2.3