diff options
| author | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:02:03 +0100 |
|---|---|---|
| committer | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:19:24 +0100 |
| commit | 8b83c8996686072bc743b112ae5cb3bf93aa33ed (patch) | |
| tree | b09ce6a7ff470b05006622f19914b3d39d2f7d9f /common/msg.c | |
| parent | 5bcac8580df6fc62323136f756a3a6d1e754fe9c (diff) | |
| parent | 559a400ac36e75a8d73ba263fd7fa6736df1c2da (diff) | |
| download | mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.bz2 mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.xz | |
Merge commit '559a400ac36e75a8d73ba263fd7fa6736df1c2da' into wm4-commits--merge-edition
This bumps libmpv version to 1.103
Diffstat (limited to 'common/msg.c')
| -rw-r--r-- | common/msg.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/common/msg.c b/common/msg.c index b8e89bec31..cb41ea4168 100644 --- a/common/msg.c +++ b/common/msg.c @@ -460,8 +460,6 @@ void mp_msg_init(struct mpv_global *global) struct mp_log *log = mp_log_new(root, &dummy, ""); global->log = log; - - mp_msg_update_msglevels(global); } // If opt is different from *current_path, reopen *file and update *current_path. @@ -501,13 +499,9 @@ static void reopen_file(char *opt, char **current_path, FILE **file, talloc_free(tmp); } -void mp_msg_update_msglevels(struct mpv_global *global) +void mp_msg_update_msglevels(struct mpv_global *global, struct MPOpts *opts) { struct mp_log_root *root = global->log->root; - struct MPOpts *opts = global->opts; - - if (!opts) - return; pthread_mutex_lock(&mp_msg_lock); @@ -522,8 +516,7 @@ void mp_msg_update_msglevels(struct mpv_global *global) } m_option_type_msglevels.free(&root->msg_levels); - m_option_type_msglevels.copy(NULL, &root->msg_levels, - &global->opts->msg_levels); + m_option_type_msglevels.copy(NULL, &root->msg_levels, &opts->msg_levels); atomic_fetch_add(&root->reload_counter, 1); pthread_mutex_unlock(&mp_msg_lock); |