From 572c32abbedd3860718f099743dfa973b4f58bbc Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 20 Dec 2019 08:35:08 +0100 Subject: libarchive: prefix entry names in archive URLs with '/' This has the advantage that playlists within the archive will work as expected, because demux_playlist will correctly join the archive base URL and entry name. Before this change, it could skip before the "|", resulting in a broken URL. --- demux/demux_libarchive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux/demux_libarchive.c') diff --git a/demux/demux_libarchive.c b/demux/demux_libarchive.c index bb2ca24862..80bd3e240e 100644 --- a/demux/demux_libarchive.c +++ b/demux/demux_libarchive.c @@ -74,7 +74,7 @@ static int open_file(struct demuxer *demuxer, enum demux_check check) while (mp_archive_next_entry(mpa)) { // stream_libarchive.c does the real work - char *f = talloc_asprintf(mpa, "archive://%s|%s", prefix, + char *f = talloc_asprintf(mpa, "archive://%s|/%s", prefix, mpa->entry_filename); MP_TARRAY_APPEND(mpa, files, num_files, f); } -- cgit v1.2.3