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 /common | |
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 'common')
-rw-r--r-- | common/playlist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/playlist.c b/common/playlist.c index bb849f18a0..df3b65fbbc 100644 --- a/common/playlist.c +++ b/common/playlist.c @@ -199,7 +199,7 @@ void playlist_add_base_path(struct playlist *pl, bstr base_path) return; for (struct playlist_entry *e = pl->first; e; e = e->next) { if (!mp_is_url(bstr0(e->filename))) { - char *new_file = mp_path_join(e, base_path, bstr0(e->filename)); + char *new_file = mp_path_join_bstr(e, base_path, bstr0(e->filename)); talloc_free(e->filename); e->filename = new_file; } |