RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Dudemanguy 2023-12-12 10:21:43 -06:00
parent 9b001b448c
commit 6d1383383b
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/playlist.c
View File

@ -391,6 +391,7 @@ struct playlist *playlist_parse_file(const char *file, struct mp_cancel *cancel,
struct playlist *ret = NULL; struct playlist *ret = NULL;
if (d && d->playlist) { if (d && d->playlist) {
ret = talloc_zero(NULL, struct playlist); ret = talloc_zero(NULL, struct playlist);
playlist_populate_playlist_path(d->playlist, file);
playlist_transfer_entries(ret, d->playlist); playlist_transfer_entries(ret, d->playlist);
if (d->filetype && strcmp(d->filetype, "hls") == 0) { if (d->filetype && strcmp(d->filetype, "hls") == 0) {
mp_warn(log, "This might be a HLS stream. For correct operation, " mp_warn(log, "This might be a HLS stream. For correct operation, "

1
options/parse_commandline.c
View File

@ -201,7 +201,6 @@ int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files,
goto err_out; goto err_out;
} }
playlist_transfer_entries(files, pl); playlist_transfer_entries(files, pl);
playlist_populate_playlist_path(files, param0);
talloc_free(param0); talloc_free(param0);
talloc_free(pl); talloc_free(pl);
continue; continue;