summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-31 19:49:39 +0200
committerwm4 <wm4@nowhere>2014-08-31 19:49:39 +0200
commit866e0e1670f79653203a3da65096841ab37fc903 (patch)
tree2c01331832dc0be8d77954936f1e590a6d2728a4 /DOCS
parentfc0fa9a221882647da563acc2d22eac0f27b1120 (diff)
downloadmpv-866e0e1670f79653203a3da65096841ab37fc903.tar.bz2
mpv-866e0e1670f79653203a3da65096841ab37fc903.tar.xz
player: always load playlists
Until now, you had to use --load-unsafe-playlists or --playlist to get playlists loaded. Change this and always load playlists by default. This still attempts to reject unsafe URLs. For example, trying to invoke libavdevice pseudo-demuxer is explicitly prevented. Local paths and any http links (and some more) are always allowed.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/options.rst20
1 files changed, 6 insertions, 14 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 87f7eb54b2..d2b062109c 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -198,20 +198,12 @@ Playback Control
(i.e. not with stdin, pipe, etc).
``--load-unsafe-playlists``
- Normally, something like ``mpv playlist.m3u`` won't load the playlist. This
- is because the playlist code is unsafe. (This is the same in all other
- variations of MPlayer.)
-
- See ``--playlist`` for details.
-
- Note: this option will allow opening playlists using the ``playlist``
- special demuxer. The ``--playlist`` uses different code, and supports more
- playlist formats than the playlist demuxer. This means that for now, the
- ``--playlist`` option should always be used if you intend to open playlists.
- Background: the special demuxer contains newly written code, while the
- ``--playlist`` option uses the old MPlayer code. Adding support for more
- playlist formats to the special demuxer is work in progress, and eventually
- the old code should disappear.
+ Load URLs from playlists which are considered unsafe (default: no). This
+ includes special protocols and anything that doesn't refer to normal files.
+ Local files and http links on the other hand are always considered safe.
+
+ Note that ``--playlist`` always loads all entries, so you use that instead
+ if you really have the need for this functionality.
``--loop-file``
Loop a single file. The difference to ``--loop=inf`` is that this doesn't