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(). --- video/out/gl_lcms.c | 2 +- video/out/vo_image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'video') diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c index aca4825917..b7ee51360c 100644 --- a/video/out/gl_lcms.c +++ b/video/out/gl_lcms.c @@ -230,7 +230,7 @@ bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **result_lut3d) cache_file = talloc_strdup(tmp, ""); for (int i = 0; i < sizeof(hash); i++) cache_file = talloc_asprintf_append(cache_file, "%02X", hash[i]); - cache_file = mp_path_join(tmp, bstr0(cache_dir), bstr0(cache_file)); + cache_file = mp_path_join(tmp, cache_dir, cache_file); mp_mkdirp(cache_dir); } diff --git a/video/out/vo_image.c b/video/out/vo_image.c index 4a87d82deb..e8f9e1f063 100644 --- a/video/out/vo_image.c +++ b/video/out/vo_image.c @@ -95,7 +95,7 @@ static void flip_page(struct vo *vo) image_writer_file_ext(p->opts)); if (p->outdir && strlen(p->outdir)) - filename = mp_path_join(t, bstr0(p->outdir), bstr0(filename)); + filename = mp_path_join(t, p->outdir, filename); MP_INFO(vo, "Saving %s\n", filename); write_image(p->current, p->opts, filename, vo->log); -- cgit v1.2.3