diff options
| author | wm4 <wm4@nowhere> | 2015-05-09 15:26:47 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-05-09 15:26:47 +0200 |
| commit | 04c02796bd371e65f81a92b853658b8fbadb7ad5 (patch) | |
| tree | 75b09115e17eedbf06cb3233eb145a5c19f72b58 /demux/demux_playlist.c | |
| parent | 40997b8ae5b4065b3e71d4369eaba14c991e5027 (diff) | |
| download | mpv-04c02796bd371e65f81a92b853658b8fbadb7ad5.tar.bz2 mpv-04c02796bd371e65f81a92b853658b8fbadb7ad5.tar.xz | |
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().
Diffstat (limited to 'demux/demux_playlist.c')
| -rw-r--r-- | demux/demux_playlist.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |