summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-02-15 15:11:05 +0100
committerwm4 <wm4@nowhere>2020-02-15 15:11:05 +0100
commit64c4c59770c2f64e1ac4b78fb7bc12299df3072a (patch)
treed3575c65a54f701782be631599b9c1c96e5f3084
parent96ef62161ac8edb3c111bde7a79cb07dd6db813c (diff)
downloadmpv-64c4c59770c2f64e1ac4b78fb7bc12299df3072a.tar.bz2
mpv-64c4c59770c2f64e1ac4b78fb7bc12299df3072a.tar.xz
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).
-rw-r--r--demux/demux_edl.c5
1 files changed, 4 insertions, 1 deletions
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));
+ }
}
}