summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2017-12-07 00:45:40 -0800
committerKevin Mitchell <kevmitch@gmail.com>2017-12-07 00:46:27 -0800
commit985e83e217bbb845b94fc8ccf9219c779059a8af (patch)
tree851d76c43b36d6e3b26a3d38bea1c200f8e8ef51
parent06519aae5837312437b07e8bfef10c025ec2f688 (diff)
downloadmpv-985e83e217bbb845b94fc8ccf9219c779059a8af.tar.bz2
mpv-985e83e217bbb845b94fc8ccf9219c779059a8af.tar.xz
Revert "ytdl: handle HLS with FFmpeg"
Apparently, this breaks youtube live and possibly other things. This reverts commit 06519aae5837312437b07e8bfef10c025ec2f688.
-rw-r--r--player/lua/ytdl_hook.lua5
1 files changed, 1 insertions, 4 deletions
diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
index aa83f4c49c..82679a2aa8 100644
--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
@@ -382,10 +382,7 @@ mp.add_hook("on_load", 10, function ()
msg.debug('ytdl parsing took '..os.clock()-start_time..' seconds')
-- what did we get?
- if json["protocol"] == "m3u8" then
- msg.verbose("Playing directly with protocol " .. json["protocol"])
- return
- elseif not (json["direct"] == nil) and (json["direct"] == true) then
+ if not (json["direct"] == nil) and (json["direct"] == true) then
-- direct URL, nothing to do
msg.verbose("Got direct URL")
return