From 5f0a2b5908523ff3e792cab2f59901cb761332df Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 9 Dec 2014 21:53:38 +0100 Subject: options: enable --ytdl by default Let's see who complains... --- DOCS/man/changes.rst | 4 ++-- DOCS/man/options.rst | 5 +---- options/options.c | 2 +- 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 557f5efcaf..3c1cc85b3b 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -429,13 +429,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=`` diff --git a/options/options.c b/options/options.c index 33d344e00c..81a13efc94 100644 --- a/options/options.c +++ b/options/options.c @@ -620,7 +620,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, -- cgit v1.2.3