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_cue.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_cue.c')
-rw-r--r-- | demux/demux_cue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_cue.c b/demux/demux_cue.c index 93518c9336..c493647e09 100644 --- a/demux/demux_cue.c +++ b/demux/demux_cue.c @@ -226,7 +226,7 @@ static bool open_source(struct timeline *tl, struct bstr filename) if (!base_filename.len) { MP_WARN(tl, "CUE: Invalid audio filename in .cue file!\n"); } else { - char *fullname = mp_path_join(ctx, dirname, base_filename); + char *fullname = mp_path_join_bstr(ctx, dirname, base_filename); if (try_open(tl, fullname)) { res = true; goto out; @@ -252,7 +252,7 @@ static bool open_source(struct timeline *tl, struct bstr filename) MP_WARN(tl, "CUE: No useful audio filename " "in .cue file found, trying with '%s' instead!\n", dename0); - if (try_open(tl, mp_path_join(ctx, dirname, dename))) { + if (try_open(tl, mp_path_join_bstr(ctx, dirname, dename))) { res = true; break; } |