summaryrefslogtreecommitdiffstats
path: root/common/playlist.c
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2023-12-12 10:21:43 -0600
committerDudemanguy <random342@airmail.cc>2023-12-13 15:25:14 +0000
commit6d1383383b29c8968a7df02d3be808795b1f10d3 (patch)
treea6294431172d5f6dcb702c18ba1c13be373236f2 /common/playlist.c
parent9b001b448ce6eb622b3111f307e6894a5eff73ea (diff)
downloadmpv-6d1383383b29c8968a7df02d3be808795b1f10d3.tar.bz2
mpv-6d1383383b29c8968a7df02d3be808795b1f10d3.tar.xz
playlist: correctly populate playlist-path with the --playlist option
When using the --playlist option on the commandline, it would mark all entries on the command as having the playlist-path of the value of that passed option, not just the ones that were expanded from it. Fix this by moving the playlist_populate_playlist_path to the same place where the playlist file gets expanded. Ref https://github.com/mpv-player/mpv/issues/13075#issuecomment-1852179164
Diffstat (limited to 'common/playlist.c')
-rw-r--r--common/playlist.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/playlist.c b/common/playlist.c
index c1636bc695..5de8e62745 100644
--- a/common/playlist.c
+++ b/common/playlist.c
@@ -391,6 +391,7 @@ struct playlist *playlist_parse_file(const char *file, struct mp_cancel *cancel,
struct playlist *ret = NULL;
if (d && d->playlist) {
ret = talloc_zero(NULL, struct playlist);
+ playlist_populate_playlist_path(d->playlist, file);
playlist_transfer_entries(ret, d->playlist);
if (d->filetype && strcmp(d->filetype, "hls") == 0) {
mp_warn(log, "This might be a HLS stream. For correct operation, "