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_mkv_timeline.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_mkv_timeline.c')
| -rw-r--r-- | demux/demux_mkv_timeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c index c7310a66cf..e1491b631d 100644 --- a/demux/demux_mkv_timeline.c +++ b/demux/demux_mkv_timeline.c @@ -118,7 +118,7 @@ static char **find_files(const char *original_file) if (!strcmp(ep->d_name, basename)) continue; - char *name = mp_path_join(results, directory, bstr0(ep->d_name)); + char *name = mp_path_join_bstr(results, directory, bstr0(ep->d_name)); char *s1 = ep->d_name; char *s2 = basename; int matchlen = 0; |