diff options
author | Thomas Weißschuh <thomas@t-8ch.de> | 2023-02-24 03:04:52 +0000 |
---|---|---|
committer | Dudemanguy <random342@airmail.cc> | 2023-04-29 22:34:54 +0000 |
commit | 6d422b3edc00a36dde5e1b073a07938d98720f3a (patch) | |
tree | b1355c6e076da2b6fe9bb297a87e66abe9c0afe3 /player/configfiles.c | |
parent | 7668361685bcd1ab8bfa036c91b731dd86725831 (diff) | |
download | mpv-6d422b3edc00a36dde5e1b073a07938d98720f3a.tar.bz2 mpv-6d422b3edc00a36dde5e1b073a07938d98720f3a.tar.xz |
options: read config file as stream
This aligns the possible sources of config files other loaded data.
For example `--input-conf`.
Diffstat (limited to 'player/configfiles.c')
-rw-r--r-- | player/configfiles.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/configfiles.c b/player/configfiles.c index 281d2455e9..41c22ed2b9 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -52,7 +52,7 @@ static void load_all_cfgfiles(struct MPContext *mpctx, char *section, { char **cf = mp_find_all_config_files(NULL, mpctx->global, filename); for (int i = 0; cf && cf[i]; i++) - m_config_parse_config_file(mpctx->mconfig, cf[i], section, 0); + m_config_parse_config_file(mpctx->mconfig, mpctx->global, cf[i], section, 0); talloc_free(cf); } @@ -99,7 +99,7 @@ static int try_load_config(struct MPContext *mpctx, const char *file, int flags, if (!mp_path_exists(file)) return 0; MP_MSG(mpctx, msgl, "Loading config '%s'\n", file); - m_config_parse_config_file(mpctx->mconfig, file, NULL, flags); + m_config_parse_config_file(mpctx->mconfig, mpctx->global, file, NULL, flags); return 1; } |