diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-09 18:32:51 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-09 18:32:51 +0300 |
| commit | ca3feba5c339f12141bf335e5592967caccc290b (patch) | |
| tree | 06ec4960d34fd7a50c6efb80f8e017b2f4ab5d99 /stream/stream.c | |
| parent | 8ea134bd23022afbe1a06c0241c0c2c6ea2618f8 (diff) | |
| parent | 8760b0cb71dc6aa9c08d926712e64218931a1782 (diff) | |
| download | mpv-ca3feba5c339f12141bf335e5592967caccc290b.tar.bz2 mpv-ca3feba5c339f12141bf335e5592967caccc290b.tar.xz | |
Merge svn changes up to r27242
Conflicts:
Makefile
configure
Diffstat (limited to 'stream/stream.c')
| -rw-r--r-- | stream/stream.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/stream/stream.c b/stream/stream.c index 227fcf4ea4..be41c29959 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -379,8 +379,10 @@ void stream_reset(stream_t *s){ int stream_control(stream_t *s, int cmd, void *arg){ if(!s->control) return STREAM_UNSUPPORTED; +#ifdef USE_STREAM_CACHE if (s->cache_pid) return cache_do_control(s, cmd, arg); +#endif return s->control(s, cmd, arg); } |