diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
| commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
| tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /etc/input.conf | |
| parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
| parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
| download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz | |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'etc/input.conf')
| -rw-r--r-- | etc/input.conf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/input.conf b/etc/input.conf index 8cc3232795..8445e273e2 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -149,13 +149,13 @@ AR_VDOWN volume -1 ## Requires dvdnav:// ## -KP8 dvdnav 1 # DVDNav UP -KP2 dvdnav 2 # DVDNav DOWN -KP4 dvdnav 3 # DVDNav LEFT -KP6 dvdnav 4 # DVDNav RIGHT -KP5 dvdnav 5 # DVDNav MENU -KP_ENTER dvdnav 6 # DVDNav SELECT (ok) -KP7 dvdnav 7 # DVDNav PREVIOUS menu (in the order chapter->title->root) +UP {dvdnav} dvdnav 1 # DVDNav UP +DOWN {dvdnav} dvdnav 2 # DVDNav DOWN +LEFT {dvdnav} dvdnav 3 # DVDNav LEFT +RIGHT {dvdnav} dvdnav 4 # DVDNav RIGHT +ESC {dvdnav} dvdnav 5 # DVDNav MENU +ENTER {dvdnav} dvdnav 6 # DVDNav SELECT (ok) +BS {dvdnav} dvdnav 7 # DVDNav PREVIOUS menu (in the order chapter->title->root) #? seek_chapter -1 # skip to previous dvd chapter #? seek_chapter +1 # next |