diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
| commit | 1aa2e36122e6e664e42170f47d6db82873bef5aa (patch) | |
| tree | 39e13f93bcb606da9e365c7cd379132bdf53c20b /etc | |
| parent | fea8c85c8595b797fc839b113c1db252fc55c798 (diff) | |
| parent | 8cd71527ade21ea27ea24cdcc66dc71dca460f85 (diff) | |
| download | mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.bz2 mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
bstr.c
bstr.h
etc/input.conf
input/input.c
input/input.h
libao2/ao_pulse.c
libmpcodecs/vf_ass.c
libmpcodecs/vf_vo.c
libvo/gl_common.c
libvo/x11_common.c
mixer.c
mixer.h
mplayer.c
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/input.conf | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/etc/input.conf b/etc/input.conf index b358d33243..7b61344f7f 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -33,16 +33,16 @@ MOUSE_BTN4 seek -10 MOUSE_BTN5 volume 1 MOUSE_BTN6 volume -1 -# Seek units are in seconds, but note that these are mostly limited by keyframes -RIGHT seek 10 -LEFT seek -10 -UP seek 60 -DOWN seek -60 +# Seek units are in seconds, but note that these are limited by keyframes +RIGHT seek 10 +LEFT seek -10 +UP seek 60 +DOWN seek -60 # Do smaller, always exact (non-keyframe-limited), seeks with shift. Shift+RIGHT seek 1 0 1 Shift+LEFT seek -1 0 1 -Shift+UP seek 5 0 1 -Shift+DOWN seek -5 0 1 +Shift+UP seek 5 0 1 +Shift+DOWN seek -5 0 1 PGUP seek 600 PGDWN seek -600 + audio_delay 0.100 # this changes audio/video sync @@ -87,9 +87,10 @@ m mute 7 saturation -1 8 saturation 1 d frame_drop # cycle through framedrop modes -D step_property_osd deinterlace # toggle deinterlacer, requires -vf yadif or kerndeint +# toggle deinterlacer; requires either vdpau output, -vf yadif or kerndeint +D step_property_osd deinterlace c step_property_osd colormatrix -# These currently only work with --no-ass +# Next 3 currently only work with --no-ass r sub_pos -1 # move subtitles up t sub_pos +1 # down a sub_alignment @@ -106,7 +107,7 @@ i edl_mark # for use with --edlout mode T vo_ontop # toggle video window ontop of other windows f vo_fullscreen # toggle fullscreen C step_property_osd capturing -s screenshot 0 # take a png screenshot with -vf screenshot +s screenshot 0 # take a png screenshot S screenshot 1 # ...on every frame Alt+s screenshot 0 1 # take a screenshot of window contents Alt+S screenshot 1 1 # ...on every frame |