Merge branch 'master' into release/current

1 files changed, 5 insertions, 1 deletions

diff --git a/common/global.h b/common/global.h
index fb70b4ff01..879ca72386 100644
--- a/common/global.h
+++ b/common/global.h
@@ -5,9 +5,13 @@
 // The only purpose of this is to make mpv library-safe.
 // Think hard before adding new members.
 struct mpv_global {
-    struct MPOpts *opts;
     struct mp_log *log;
+    struct m_config_shadow *config;
     struct mp_client_api *client_api;
+
+    // Using this is deprecated and should be avoided (missing synchronization).
+    // Use m_config_cache to access mpv_global.config instead.
+    struct MPOpts *opts;
 };
 
 #endif