From 04c02796bd371e65f81a92b853658b8fbadb7ad5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 May 2015 15:26:47 +0200 Subject: 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(). --- demux/demux_edl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux/demux_edl.c') 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)); } } -- cgit v1.2.3