summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-01 00:10:00 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-09-01 14:48:23 +0200
commit6d006a5a3943e74974ae0b2c55a634a493a6f255 (patch)
tree31a6705312e646c0e82d2d4e7453826aff495eeb
parent6a355959d95a3393c58054476687017bd20ab266 (diff)
downloadmpv-6d006a5a3943e74974ae0b2c55a634a493a6f255.tar.bz2
mpv-6d006a5a3943e74974ae0b2c55a634a493a6f255.tar.xz
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.c3
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;
}