From 64c4c59770c2f64e1ac4b78fb7bc12299df3072a Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 15 Feb 2020 15:11:05 +0100 Subject: demux_edl: accept protocol entries in EDL entries again Accidentally broken by commit 99700bc52c1317. mp_path_join() does not check for this, because it's supposed to work on filesystem strings (and e.g. "http://fubar" is a valid relative path in UNIX). --- demux/demux_edl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'demux') diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 291072d6e6..0c153874c0 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -458,7 +458,10 @@ static void fix_filenames(struct tl_parts *parts, char *source_path) struct bstr dirname = mp_dirname(source_path); for (int n = 0; n < parts->num_parts; n++) { struct tl_part *part = &parts->parts[n]; - part->filename = mp_path_join_bstr(parts, dirname, bstr0(part->filename)); + if (!mp_is_url(bstr0(part->filename))) { + part->filename = + mp_path_join_bstr(parts, dirname, bstr0(part->filename)); + } } } -- cgit v1.2.3