diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:39:41 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:39:41 +0300 |
commit | 0e0d88ede9c7e9decf4079adcffc7713d4ded210 (patch) | |
tree | 819165655b2b2bc72f4ffa12f4bfec93e6f8bb36 /input | |
parent | c61e57bdd035ba2e151df9cdc7f3186ddf5fcb97 (diff) | |
parent | a564c5a6cc3eeeaa5b271aead5d05b90e6fdb041 (diff) | |
download | mpv-0e0d88ede9c7e9decf4079adcffc7713d4ded210.tar.bz2 mpv-0e0d88ede9c7e9decf4079adcffc7713d4ded210.tar.xz |
Merge svn changes up to r31256
Diffstat (limited to 'input')
-rw-r--r-- | input/input.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/input/input.c b/input/input.c index a751cc2fc3..8651e83fbc 100644 --- a/input/input.c +++ b/input/input.c @@ -1169,6 +1169,9 @@ static mp_cmd_t *check_autorepeat(struct input_ctx *ictx) } +/** + * \param time time to wait at most for an event in milliseconds + */ static mp_cmd_t *read_events(struct input_ctx *ictx, int time) { int i; @@ -1837,6 +1840,9 @@ static int print_cmd_list(m_option_t* cfg) exit(0); } +/** + * \param time time to wait for an interruption in milliseconds + */ int mp_input_check_interrupt(struct input_ctx *ictx, int time) { mp_cmd_t* cmd; |