summaryrefslogtreecommitdiffstats
path: root/DOCS/man/options.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-02-20 16:22:15 +0100
committerwm4 <wm4@nowhere>2016-02-20 16:22:15 +0100
commit297fdcc0955f70ff03bbd07a6d23550159a41b62 (patch)
treebaf93cc25e48b6b04cdc4e428dd06f772127aadd /DOCS/man/options.rst
parentd549c4e402fbcebbab52ad00d90642bbca67963c (diff)
downloadmpv-297fdcc0955f70ff03bbd07a6d23550159a41b62.tar.bz2
mpv-297fdcc0955f70ff03bbd07a6d23550159a41b62.tar.xz
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.
Diffstat (limited to 'DOCS/man/options.rst')
-rw-r--r--DOCS/man/options.rst3
1 files changed, 1 insertions, 2 deletions
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