diff options
author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /input | |
parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'input')
-rw-r--r-- | input/input.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/input/input.c b/input/input.c index dfd3f81fb9..6643747e4d 100644 --- a/input/input.c +++ b/input/input.c @@ -159,10 +159,11 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", { ARG_INT, ARG_INT } }, { MP_CMD_SCREENSHOT, "screenshot", { - OARG_CHOICE(0, ({"single", 0}, {"0", 0}, - {"each-frame", 1}, {"1", 1})), - OARG_CHOICE(0, ({"video", 0}, {"0", 0}, - {"window", 1}, {"1", 1})), + OARG_CHOICE(2, ({"video", 0}, + {"window", 1}, + {"subtitles", 2})), + OARG_CHOICE(0, ({"single", 0}, + {"each-frame", 1})), }}, { MP_CMD_LOADFILE, "loadfile", { ARG_STRING, |