summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-29 22:08:22 +0100
committerwm4 <wm4@nowhere>2014-12-29 22:08:22 +0100
commit6618e5d69ab2f1eef70769e46f4129d13bd7ff29 (patch)
treeff20ad08cc4673073543fbd866a4fff2bc8478e6 /DOCS
parent40755180113ac58cd98fb0f6758c1466e56d5f94 (diff)
downloadmpv-6618e5d69ab2f1eef70769e46f4129d13bd7ff29.tar.bz2
mpv-6618e5d69ab2f1eef70769e46f4129d13bd7ff29.tar.xz
player: make --shuffle/--merge-files affect runtime loaded playlists
Until now, these options took effect only at program start. This could be confusing when e.g. doing "mpv list.m3u --shuffle". Make them always take effect when a playlist is loaded either via a playlist file, or with the "loadlist" command.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/options.rst4
1 files changed, 0 insertions, 4 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 1635461ec5..0feca9d765 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -363,10 +363,6 @@ Program Behavior
file. This uses timeline/EDL support internally. Note that this won't work
for ordered chapter files.
- This option is interpreted at program start, and doesn't affect for
- example files or playlists loaded with the ``loadfile`` or ``loadlist``
- commands.
-
``--no-resume-playback``
Do not restore playback position from the ``watch_later`` configuration
subdirectory (usually ``~/.config/mpv/watch_later/``).