diff options
author | wm4 <wm4@nowhere> | 2018-08-31 12:48:36 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2018-08-31 12:55:22 +0200 |
commit | 559a400ac36e75a8d73ba263fd7fa6736df1c2da (patch) | |
tree | 5e117d0ddfd279cae346fc334d4c3f9262509fef /demux/demux_mkv_timeline.c | |
parent | 5f83b6a5f5939ce39af929f200b1ea236fbe350c (diff) | |
download | mpv-559a400ac36e75a8d73ba263fd7fa6736df1c2da.tar.bz2 mpv-559a400ac36e75a8d73ba263fd7fa6736df1c2da.tar.xz |
demux, stream: rip out the classic stream cache
The demuxer cache is the only cache now. Might need another change to
combat seeking failures in mp4 etc. The only bad thing is the loss of
cache-speed, which was sort of nice to have.
Diffstat (limited to 'demux/demux_mkv_timeline.c')
-rw-r--r-- | demux/demux_mkv_timeline.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c index 32eab2ca8f..69cf26e681 100644 --- a/demux/demux_mkv_timeline.c +++ b/demux/demux_mkv_timeline.c @@ -172,7 +172,6 @@ static bool check_file_seg(struct tl_ctx *ctx, char *filename, int segment) .matroska_wanted_segment = segment, .matroska_was_valid = &was_valid, .disable_timeline = true, - .disable_cache = true, }; struct mp_cancel *cancel = ctx->tl->cancel; if (mp_cancel_test(cancel)) @@ -216,15 +215,6 @@ static bool check_file_seg(struct tl_ctx *ctx, char *filename, int segment) } } - if (stream_wants_cache(d->stream, ctx->opts->stream_cache)) { - demux_free(d); - params.disable_cache = false; - params.matroska_wanted_uids = ctx->uids; // potentially reallocated, same data - d = demux_open_url(filename, ¶ms, cancel, ctx->global); - if (!d) - return false; - } - ctx->sources[i] = d; return true; } |