summaryrefslogtreecommitdiffstats
path: root/DOCS/man/osc.rst
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.dev>2023-12-13 19:23:21 +0100
committermia <652892+mia-0@users.noreply.github.com>2023-12-13 19:29:39 +0100
commitb690531f3047f9eac85450457e04f67e2e2aa69b (patch)
treea6294431172d5f6dcb702c18ba1c13be373236f2 /DOCS/man/osc.rst
parentaf2635d8c9389504cb0b07a78f3999096d80a1ab (diff)
downloadmpv-b690531f3047f9eac85450457e04f67e2e2aa69b.tar.bz2
mpv-b690531f3047f9eac85450457e04f67e2e2aa69b.tar.xz
Revert "OSC: Remove merriment"
This reverts commit af2635d8c9389504cb0b07a78f3999096d80a1ab, and restores feature parity with VLC.
Diffstat (limited to 'DOCS/man/osc.rst')
-rw-r--r--DOCS/man/osc.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst
index 84acf5cb8c..c791d7522f 100644
--- a/DOCS/man/osc.rst
+++ b/DOCS/man/osc.rst
@@ -393,6 +393,11 @@ Configurable Options
Supports ``left`` and ``right`` which will place the controls on those
respective sides.
+``greenandgrumpy``
+ Default: no
+
+ Set to ``yes`` to reduce festivity (i.e. disable santa hat in December.)
+
``livemarkers``
Default: yes