diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-23 01:56:21 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-23 01:56:21 +0200 |
| commit | 5995bc175aea0417ce7ff7285c1c8fc84ebb5704 (patch) | |
| tree | 7fa0b90e03fc5b3a6447b79754b654bc279f5237 /stream/cache2.c | |
| parent | 4c552b2e420ba4cb6d888b12360c7bf63e7cd03a (diff) | |
| parent | af2988cbcef1b057772d44b9f9752be3f15960b0 (diff) | |
| download | mpv-5995bc175aea0417ce7ff7285c1c8fc84ebb5704.tar.bz2 mpv-5995bc175aea0417ce7ff7285c1c8fc84ebb5704.tar.xz | |
Merge svn changes up to r29962
Diffstat (limited to 'stream/cache2.c')
| -rw-r--r-- | stream/cache2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/stream/cache2.c b/stream/cache2.c index 78acdc9845..4c9bdf8aec 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -307,8 +307,7 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE; cache_vars_t* s; - if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) { - // The stream has no 'fd' behind it, so is non-cacheable + if (stream->flags & STREAM_NON_CACHEABLE) { mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); return 1; } |