summaryrefslogtreecommitdiffstats
path: root/demux/demux_edl.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-09 15:26:47 +0200
committerwm4 <wm4@nowhere>2015-05-09 15:26:47 +0200
commit04c02796bd371e65f81a92b853658b8fbadb7ad5 (patch)
tree75b09115e17eedbf06cb3233eb145a5c19f72b58 /demux/demux_edl.c
parent40997b8ae5b4065b3e71d4369eaba14c991e5027 (diff)
downloadmpv-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_edl.c')
-rw-r--r--demux/demux_edl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index 3bda4f44b2..fc0db2f2fa 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -272,7 +272,7 @@ static void fix_filenames(struct tl_parts *parts, char *source_path)
for (int n = 0; n < parts->num_parts; n++) {
struct tl_part *part = &parts->parts[n];
char *filename = mp_basename(part->filename); // plain filename only
- part->filename = mp_path_join(parts, dirname, bstr0(filename));
+ part->filename = mp_path_join_bstr(parts, dirname, bstr0(filename));
}
}