From 04c02796bd371e65f81a92b853658b8fbadb7ad5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 May 2015 15:26:47 +0200 Subject: path: make mp_path_join accept normal C strings Instead of bstr. Most callers of this function do not need bstr. The bstr version of this function is now mp_path_join_bstr(). --- demux/demux_playlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux/demux_playlist.c') diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c index 6f73bea5ba..0479694b34 100644 --- a/demux/demux_playlist.c +++ b/demux/demux_playlist.c @@ -245,7 +245,7 @@ static int parse_dir(struct pl_parser *p) qsort(files, num_files, sizeof(files[0]), cmp_filename); for (int n = 0; n < num_files; n++) - playlist_add_file(p->pl, mp_path_join(p, bstr0(path), bstr0(files[n]))); + playlist_add_file(p->pl, mp_path_join(p, path, files[n])); closedir(dp); -- cgit v1.2.3