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 /stream/stream.h | |
parent | c61e57bdd035ba2e151df9cdc7f3186ddf5fcb97 (diff) | |
parent | a564c5a6cc3eeeaa5b271aead5d05b90e6fdb041 (diff) | |
download | mpv-0e0d88ede9c7e9decf4079adcffc7713d4ded210.tar.bz2 mpv-0e0d88ede9c7e9decf4079adcffc7713d4ded210.tar.xz |
Merge svn changes up to r31256
Diffstat (limited to 'stream/stream.h')
-rw-r--r-- | stream/stream.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stream/stream.h b/stream/stream.h index 5cbc304e81..40ea321bc4 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -336,7 +336,8 @@ stream_t *open_output_stream(const char *filename, struct MPOpts *options); struct input_ctx; void stream_set_interrupt_callback(int (*cb)(struct input_ctx*, int), struct input_ctx *ctx); -/// Call the interrupt checking callback if there is one. +/// Call the interrupt checking callback if there is one and +/// wait for time milliseconds int stream_check_interrupt(int time); extern int dvd_title; |