summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2018-01-26 11:26:27 +0000
committerRicardo Constantino <wiiaboo@gmail.com>2018-01-26 11:29:55 +0000
commitf8263e82cc74a9ac6530508bec39c7b0dc02568f (patch)
treee1ffb50f26e9c4a3d012b3e8f4378d93be17ee7b
parent573bfae7e46aea1ceb00400b5edbee762ed74254 (diff)
downloadmpv-f8263e82cc74a9ac6530508bec39c7b0dc02568f.tar.bz2
mpv-f8263e82cc74a9ac6530508bec39c7b0dc02568f.tar.xz
ytdl_hook: move url_is_safe earlier in code
lua isn't javascript.
-rw-r--r--player/lua/ytdl_hook.lua18
1 files changed, 9 insertions, 9 deletions
diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
index b480c21625..458c94af38 100644
--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
@@ -84,6 +84,15 @@ local function edl_escape(url)
return "%" .. string.len(url) .. "%" .. url
end
+local function url_is_safe(url)
+ local proto = type(url) == "string" and url:match("^(.+)://") or nil
+ local safe = proto and safe_protos[proto]
+ if not safe then
+ msg.error(("Ignoring potentially unsafe url: '%s'"):format(url))
+ end
+ return safe
+end
+
local function time_to_secs(time_string)
local ret
@@ -223,15 +232,6 @@ local function proto_is_dash(json)
or json["protocol"] == "http_dash_segments"
end
-local function url_is_safe(url)
- local proto = type(url) == "string" and url:match("^(.+)://") or nil
- local safe = proto and safe_protos[proto]
- if not safe then
- msg.error(("Ignoring potentially unsafe url: '%s'"):format(url))
- end
- return safe
-end
-
local function add_single_video(json)
local streamurl = ""
local max_bitrate = 0