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.c | |
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.c')
-rw-r--r-- | stream/stream.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/stream/stream.c b/stream/stream.c index 165166245d..01245b757a 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -37,6 +37,7 @@ #include "mp_msg.h" #include "osdep/shmem.h" +#include "osdep/timer.h" #include "network.h" #include "stream.h" #include "libmpdemux/demuxer.h" @@ -490,7 +491,10 @@ void stream_set_interrupt_callback(int (*cb)(struct input_ctx *, int), } int stream_check_interrupt(int time) { - if(!stream_check_interrupt_cb) return 0; + if(!stream_check_interrupt_cb) { + usec_sleep(time * 1000); + return 0; + } return stream_check_interrupt_cb(stream_check_interrupt_ctx, time); } |