summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2018-01-26 11:26:27 +0000
committerKevin Mitchell <kevmitch@gmail.com>2018-02-10 04:45:09 -0800
commit83299b838291d119fc258e8e8c794f219cb56140 (patch)
treeba1e24225462ecb0f94e2ee50a5ca35d1275f840
parent899ce946930e695af757b13d5374f005087285e4 (diff)
downloadmpv-83299b838291d119fc258e8e8c794f219cb56140.tar.bz2
mpv-83299b838291d119fc258e8e8c794f219cb56140.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 601c2ad066..7da39d3553 100644
--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
@@ -83,6 +83,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
@@ -206,15 +215,6 @@ local function edl_track_joined(fragments, protocol, is_live, base)
return edl .. table.concat(parts, ";") .. ";"
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 = ""