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 /etc | |
| 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 'etc')
| -rw-r--r-- | etc/input.conf | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/input.conf b/etc/input.conf index 5fd2f497cf..d310951ad9 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -102,10 +102,9 @@ TAB cycle program i edl_mark # for use with --edlout mode T cycle ontop # toggle video window ontop of other windows f cycle fullscreen # toggle fullscreen -s screenshot # take a png screenshot -S screenshot each-frame # ...on every frame -Alt+s screenshot - window # take a screenshot of window contents -Alt+S screenshot each-frame window # ...on every frame +s screenshot # take a screenshot +S screenshot video # ...without subtitles +Alt+s screenshot - each-frame # automatically screenshot every frame w add panscan -0.1 # zoom out with -panscan 0 -fs e add panscan +0.1 # in POWER quit |