summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-02 16:05:52 +0100
committerwm4 <wm4@nowhere>2014-11-02 16:05:58 +0100
commit95a5624946f3a6be3c7b79badebf1829f4633539 (patch)
tree42bd62fb0c79eed5d6a5e9ef654fa479b5f5c57a /DOCS
parent0c3df23335beb46d02d288d04ff080e18052d42f (diff)
downloadmpv-95a5624946f3a6be3c7b79badebf1829f4633539.tar.bz2
mpv-95a5624946f3a6be3c7b79badebf1829f4633539.tar.xz
manpage: update --playlist comments
Using the --playlist option is no longer recommended. A while ago, mpv rewrote all playlist parsers and added some minimal security mechanisms (like not allowing local file access or unsafe protocols in remote playlists). Further, mpv can load playlists by passing them as normal file arguments, without the option. Now, --playlist is needed only in these situations: 1) loading plaintext files 2) disabling additional security mechanisms (e.g. using a remote playlist to play local files)
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/mpv.rst3
-rw-r--r--DOCS/man/options.rst16
2 files changed, 10 insertions, 9 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 4c2c1791b2..e6aefb2859 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -12,8 +12,7 @@ a media player
SYNOPSIS
========
-| **mpv** [options] [file|URL|-]
-| **mpv** [options] --playlist=PLAYLIST
+| **mpv** [options] [file|URL|PLAYLIST|-]
| **mpv** [options] files
DESCRIPTION
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 82b8bf95a9..ee84169609 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -128,21 +128,23 @@ Playback Control
no format is detected, t will be treated as list of files, separated by
newline characters. Note that XML playlist formats are not supported.)
+ You can play playlists directly and without this option, however, this
+ option disables any security mechanisms that might be in place. You may
+ also need this option to load plaintext files as playlist.
+
.. warning::
- The way mpv uses playlist files is not safe against maliciously
- constructed files. Such files may trigger harmful actions.
+ The way mpv uses playlist files via ``--playlist`` is not safe against
+ maliciously constructed files. Such files may trigger harmful actions.
This has been the case for all mpv and MPlayer versions, but
unfortunately this fact was not well documented earlier, and some people
have even misguidedly recommended use of ``--playlist`` with untrusted
sources. Do NOT use ``--playlist`` with random internet sources or files
you do not trust!
- The main problem is that playlists can point to arbitrary network
- addresses (including local addresses inside of your LAN), and thus
- can't be considered secure. Playlists also can contain entries using
- other protocols, such as local files, or (most severely), special
- protocols like ``avdevice://``, which are inherently unsafe.
+ Playlist can contain entries using other protocols, such as local files,
+ or (most severely), special protocols like ``avdevice://``, which are
+ inherently unsafe.
``--chapter-merge-threshold=<number>``
Threshold for merging almost consecutive ordered chapter parts in