RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-19 14:26:57 +00:00
Code Issues Releases Wiki Activity

demux_edl: accept protocol entries in EDL entries again

Browse Source 
Accidentally broken by commit 99700bc52c. 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).
This commit is contained in:
wm4 2020-02-15 15:11:05 +01:00
parent 96ef62161a
commit 64c4c59770
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demux/demux_edl.c
View File

@ -458,7 +458,10 @@ static void fix_filenames(struct tl_parts *parts, char *source_path)
struct bstr dirname = mp_dirname(source_path); struct bstr dirname = mp_dirname(source_path);
for (int n = 0; n < parts->num_parts; n++) { for (int n = 0; n < parts->num_parts; n++) {
struct tl_part *part = &parts->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));
}
} }
} }