diff options
| author |  wm4 <wm4@nowhere> | 2014-09-01 00:10:00 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-09-01 00:13:10 +0200 |
| commit | 129a7c056a524b33cc4c87c67d7919f8d5894ca3 (patch) | |
| tree | 8bead5cfe07086156c409a7488571c3c0ac8685c | |
| parent | f59f1e532e46779b1758bedf972fdfce3a74ea44 (diff) | |
playlist: don't add the base path twice
Loading a playlist with --playlist from a sub-directory added the
playlist's base path twice: one time in the playlist demuxer, and then
again in playlist_parse_file(). The latter function is used only for
--playlist, so it worked when loading the playlist directly.
(This is probably a mess-up when the MPlayer playlist parsers were
replaced with newer code.)
CC: @mpv-player/stable
| -rw-r--r-- | common/playlist.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/common/playlist.c b/common/playlist.c index 4df3396b04..d64db16e98 100644 --- a/common/playlist.c +++ b/common/playlist.c @@ -286,9 +286,6 @@ struct playlist *playlist_parse_file(const char *file, struct mpv_global *global if (ret && !ret->first) mp_warn(log, "Warning: empty playlist\n"); - if (ret) - playlist_add_base_path(ret, mp_dirname(file)); - talloc_free(log); return ret; } |