RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 02:52:10 +00:00
Code Issues Releases Wiki Activity

vo_opengl: gl_lcms: use mp_path_join()

Browse Source 
Maybe this fixes the win32 problems a user had, or maybe not.

Also, check if cache_dir is set at all. An empty string should be
equivalent to "unset".
This commit is contained in:
wm4 2015-05-02 16:29:30 +02:00
parent a52a494fe4
commit ff1b5432e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/out/gl_lcms.c
View File

@ -206,7 +206,7 @@ bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **result_lut3d)
cmsContext cms = NULL; cmsContext cms = NULL;
char *cache_file = NULL; char *cache_file = NULL;
if (p->opts.cache_dir) { if (p->opts.cache_dir && p->opts.cache_dir[0]) {
// Gamma is included in the header to help uniquely identify it, // Gamma is included in the header to help uniquely identify it,
// because we may change the parameter in the future or make it // because we may change the parameter in the future or make it
// customizable, same for the primaries. // customizable, same for the primaries.
@ -224,10 +224,10 @@ bool gl_lcms_get_lut3d(struct gl_lcms *p, struct lut3d **result_lut3d)
av_sha_final(sha, hash); av_sha_final(sha, hash);
av_free(sha); av_free(sha);
cache_file = talloc_strdup(tmp, p->opts.cache_dir); cache_file = talloc_strdup(tmp, "");
cache_file = talloc_asprintf_append(cache_file, "/");
for (int i = 0; i < sizeof(hash); i++) for (int i = 0; i < sizeof(hash); i++)
cache_file = talloc_asprintf_append(cache_file, "%02X", hash[i]); cache_file = talloc_asprintf_append(cache_file, "%02X", hash[i]);
cache_file = mp_path_join(tmp, bstr0(p->opts.cache_dir), bstr0(cache_file));
} }
// check cache // check cache