options: drop --opt:subopt option names

For all suboptions, "flat" options were available by separating the
parent option and the sub option with ":", e.g. "--rawvideo:w=123". Drop
this syntax and use "-" as separator. This means even suboptions are
available as normal options now, e.g. "--rawvideo-w=123". The old syntax
doesn't work anymore.

Note that this is completely separate from actual suboptions. For
example, "-rawvideo w=123:h=123" still works. (Not that this syntax is
worth supporting, but it's needed anyway, for for other things like vf
and vo suboptions.)

As a consequence of this change, we also have to add new "no-" prefixed
options for flag suboptions, so that "--no-input-default-bindings"
works. ("--input-no-default-bindings" also works as a consequence of
allowing "-input no-default-bindings" - they are handled by the same
underlying option.)

For --input, always use the full syntax in the manpage. There exist
suboptions other than --input (like --tv, --rawvideo, etc.), but since
they might be handled differently in the future, don't touch these yet.

M_OPT_PREFIXED becomes the default, so remove it. As a minor unrelated
cleanup, get rid of M_OPT_MERGE too and use the OPT_SUBSTRUCT() macro in
some places.

Unrelated: remove the duplicated --tv:buffersize option, fix a typo in
changes.rst.

4 files changed, 37 insertions, 45 deletions

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index adaf1aa0d2..7f09d942a0 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -157,7 +157,7 @@ input.conf and slave commands
     |                                | a negative step instead.               |
     +--------------------------------+----------------------------------------+
     | step_property <prop> <step>    | Prefix cycle or add with no-osd:       |
-    | <dur>                          | no-osd cycle <prop> <step>             |
+    | <dir>                          | no-osd cycle <prop> <step>             |
     +--------------------------------+----------------------------------------+
     | osd_show_property_text <text>  | show_text <text>                       |
     |                                | The property expansion format string   |
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index 8a9b4f0e42..a0d2ad00c4 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -14,7 +14,7 @@ with shift.
 
 A list of special keys can be obtained with
 
-| **mpv** --input=keylist
+| **mpv** --input-keylist
 
 In general, keys can be combined with ``Shift``, ``Ctrl`` and ``Alt``:
 
@@ -23,7 +23,7 @@ In general, keys can be combined with ``Shift``, ``Ctrl`` and ``Alt``:
 **mpv** can be started in input test mode, which displays key bindings and the
 commands they're bound to on the OSD, instead of running the commands:
 
-| **mpv** --input=test --demuxer=rawvideo --rawvideo=w=1280:h=720 /dev/zero
+| **mpv** --input-test --demuxer=rawvideo --rawvideo=w=1280:h=720 /dev/zero
 
 (Commands which normally close the player will not work in this mode, and you
 must kill **mpv** externally to make it exit.)
@@ -51,7 +51,7 @@ List of input commands
 ignore
     Use this to "block" keys that should be unbound, and do nothing. Useful for
     disabling default bindings, without disabling all bindings with
-    ``--input=default-bindings=no``.
+    ``--no-input-default-bindings``.
 
 seek <seconds> [relative|absolute|absolute-percent|- [default-precise|exact|keyframes]]
     Change the playback position. By default, seeks by a relative amount of
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst
index 415e19c7e8..c784d90704 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/en/mpv.rst
@@ -49,7 +49,7 @@ INTERACTIVE CONTROL
 
 mpv has a fully configurable, command-driven control layer which allows you
 to control mpv using keyboard, mouse, joystick or remote control (with
-LIRC). See the ``--input`` option for ways to customize it.
+LIRC). See the ``--input-`` options for ways to customize it.
 
 keyboard control
 ----------------
@@ -588,7 +588,7 @@ FILES
     mpv user settings
 
 ``~/.mpv/input.conf``
-    input bindings (see ``--input=keylist`` for the full list)
+    input bindings (see ``--input-keylist`` for the full list)
 
 ``~/.mpv/DVDkeys/``
     cached CSS keys
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index fcab7ae8e0..fcfc17923e 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -896,55 +896,47 @@
     their start timestamps differ, and then video timing is gradually adjusted
     if necessary to reach correct synchronization later.
 
---input=<commands>
-    This option can be used to configure certain parts of the input system.
-    Paths are relative to ``~/.mpv/``.
+--input-conf=<filename>
+    Specify input configuration file other than the default
+    ``~/.mpv/input.conf``.
 
-    *NOTE*: Autorepeat is currently only supported by joysticks.
+--input-ar-dev=<device>
+    Device to be used for Apple IR Remote (default is autodetected, Linux
+    only).
 
-    Available commands are:
+--input-ar-delay
+    Delay in milliseconds before we start to autorepeat a key (0 to
+    disable).
 
-    conf=<filename>
-        Specify input configuration file other than the default
-        ``~/.mpv/input.conf``.
+--input-ar-rate
+    Number of key presses to generate per second on autorepeat.
 
-    ar-dev=<device>
-        Device to be used for Apple IR Remote (default is autodetected, Linux
-        only).
+--no-input-default-bindings
+    Use the key bindings that mpv ships with by default.
 
-    ar-delay
-        Delay in milliseconds before we start to autorepeat a key (0 to
-        disable).
+--input-keylist
+    Prints all keys that can be bound to commands.
 
-    ar-rate
-        Number of key presses to generate per second on autorepeat.
+--input-cmdlist
+    Prints all commands that can be bound to keys.
 
-    (no-)default-bindings
-        Use the key bindings that mpv ships with by default.
+--input-js-dev
+    Specifies the joystick device to use (default: ``/dev/input/js0``).
 
-    keylist
-        Prints all keys that can be bound to commands.
+--input-file=<filename>
+    Read commands from the given file. Mostly useful with a FIFO.
+    See also ``--slave``.
 
-    cmdlist
-        Prints all commands that can be bound to keys.
+    *NOTE*: When the given file is a FIFO mpv opens both ends so you
+    can do several `echo "seek 10" > mp_pipe` and the pipe will stay
+    valid.
 
-    js-dev
-        Specifies the joystick device to use (default: ``/dev/input/js0``).
-
-    file=<filename>
-        Read commands from the given file. Mostly useful with a FIFO.
-        See also ``--slave``.
-
-        *NOTE*: When the given file is a FIFO mpv opens both ends so you
-        can do several `echo "seek 10" > mp_pipe` and the pipe will stay
-        valid.
-
-    test
-        Input test mode. Instead of executing commands on key presses, mpv
-        will show the keys and the bound commands on the OSD. Has to be used
-        with a dummy video, and the normal ways to quit the player will not
-        work (key bindings that normally quit will be shown on OSD only, just
-        like any other binding).
+--input-test
+    Input test mode. Instead of executing commands on key presses, mpv
+    will show the keys and the bound commands on the OSD. Has to be used
+    with a dummy video, and the normal ways to quit the player will not
+    work (key bindings that normally quit will be shown on OSD only, just
+    like any other binding).
 
 --ipv4-only-proxy
     Skip any HTTP proxy for IPv6 addresses. It will still be used for IPv4