summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-09 21:31:50 +0100
committerwm4 <wm4@nowhere>2014-12-09 21:55:27 +0100
commitef709d19d4ece978c13908ca2cafdf194585b426 (patch)
treef41597c5aaaeef4a8de870a375e701be9dd5b8eb
parenta8cce88663ca4ae8f130c2d23ef109d5878e5639 (diff)
downloadmpv-ef709d19d4ece978c13908ca2cafdf194585b426.tar.bz2
mpv-ef709d19d4ece978c13908ca2cafdf194585b426.tar.xz
options: --wid can be set at any time
After being bitten by this, I decided that this mostly unnecessary requirement sucks. Allowing this makes it easier to use libmpv, because it can be set after mpv_initialize(). The latest reasonable time an API user can set this variable is before actually loading a file. The previous 2 commits make sure nothing bad can happen if the option is changed at runtime even if a VO is active. The Cocoa backend should be fine and doesn't need a change.
-rw-r--r--options/options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/options/options.c b/options/options.c
index 223c3ff666..33d344e00c 100644
--- a/options/options.c
+++ b/options/options.c
@@ -441,7 +441,7 @@ const m_option_t mp_opts[] = {
OPT_FLAG("cursor-autohide-fs-only", cursor_autohide_fs, 0),
OPT_FLAG("stop-screensaver", stop_screensaver, 0),
- OPT_INT64("wid", vo.WinID, CONF_GLOBAL),
+ OPT_INT64("wid", vo.WinID, 0),
#if HAVE_X11
OPT_CHOICE("x11-netwm", vo.x11_netwm, 0,
({"auto", 0}, {"no", -1}, {"yes", 1})),