summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-09 21:53:38 +0100
committerAlessandro Ghedini <alessandro@ghedini.me>2014-12-19 19:23:28 +0100
commitc7d6b217897ebe1853eb3d968f8877b91d7fe9da (patch)
tree487a5a204924df885aa8a7a3d193e3a260e0a17b
parent8d4e6498c36e0bbc8d90d2a6f3cd630cdbf6b810 (diff)
downloadmpv-c7d6b217897ebe1853eb3d968f8877b91d7fe9da.tar.bz2
mpv-c7d6b217897ebe1853eb3d968f8877b91d7fe9da.tar.xz
options: enable --ytdl by default
Let's see who complains...
-rw-r--r--DOCS/man/changes.rst4
-rw-r--r--DOCS/man/options.rst5
-rw-r--r--options/options.c2
3 files changed, 4 insertions, 7 deletions
diff --git a/DOCS/man/changes.rst b/DOCS/man/changes.rst
index d9e4c408d1..52de58374f 100644
--- a/DOCS/man/changes.rst
+++ b/DOCS/man/changes.rst
@@ -113,8 +113,8 @@ Miscellaneous
* Matroska edition switching at runtime.
* Support for playing URLs of popular streaming sites directly.
(e.g. ``mpv https://www.youtube.com/watch?v=...``).
- Requires a recent version of ``youtube-dl`` to be installed, and
- ``ytdl=yes`` in the mpv config file.
+ Requires a recent version of ``youtube-dl`` to be installed. Can be
+ disabled with ``ytdl=no`` in the mpv config file.
* Support for precise scrolling which scales the parameter of commands. If the
input doesn't support precise scrolling the scale factor stays 1.
* Allow changing/adjusting video filters at runtime. (This is also used to make
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index e60118c4e9..f9866eb8ec 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -426,13 +426,10 @@ Program Behavior
Enable the youtube-dl hook-script. It will look at the input URL, and will
play the video located on the website. This works with many streaming sites,
not just the one the scripts are named after. This requires a recent version
- of youtube-dl to be installed on the system.
+ of youtube-dl to be installed on the system. (Enabled by default.)
If the script can't do anything with an URL, it will do nothing.
- Currently disabled by default, because youtube-dl's generic extractor can
- get stuck on some URL, preventing playback.
-
(Note: this is the replacement for the now removed libquvi support.)
``--ytdl-format=<best|worst|mp4|webm|...>``
diff --git a/options/options.c b/options/options.c
index 3327b206e1..9551cef4bc 100644
--- a/options/options.c
+++ b/options/options.c
@@ -614,7 +614,7 @@ const struct MPOpts mp_default_opts = {
.use_text_osd = 1,
#if HAVE_LUA
.lua_load_osc = 1,
- .lua_load_ytdl = 0,
+ .lua_load_ytdl = 1,
.lua_ytdl_format = NULL,
#endif
.auto_load_scripts = 1,