summaryrefslogtreecommitdiffstats
path: root/demux/demux_timeline.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-02-02 18:38:16 +0100
committerwm4 <wm4@nowhere>2017-02-02 18:38:16 +0100
commit95d4c2d7f61155633e89c18e740e7cf743a655d6 (patch)
tree89cb0fe2797eee4e54dfb693e485e4897682b950 /demux/demux_timeline.c
parentfb9a32977d6abf4c83a92d993af58e393819c062 (diff)
downloadmpv-95d4c2d7f61155633e89c18e740e7cf743a655d6.tar.bz2
mpv-95d4c2d7f61155633e89c18e740e7cf743a655d6.tar.xz
player: different way to auto-enable the demuxer cache
Instead of enabling it only when a stream-cache is enabled, also try to enable it independently from that if the demuxer is marked as is_network. Also add some code to the EDL code, so EDLs containing network streams are automatically cached this way. Extend the OSD info line so that it shows the demuxer cache in this case (more or less). I didn't find where or whether options.rst describes how the demuxer cache is enabled, so no changes there.
Diffstat (limited to 'demux/demux_timeline.c')
-rw-r--r--demux/demux_timeline.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c
index 8784dcf8f6..afd7eb5247 100644
--- a/demux/demux_timeline.c
+++ b/demux/demux_timeline.c
@@ -352,6 +352,8 @@ static int d_open(struct demuxer *demuxer, enum demux_check check)
demuxer->filetype = meta->filetype ? meta->filetype : meta->desc->name;
+ demuxer->is_network = p->tl->demuxer->is_network;
+
reselect_streams(demuxer);
return 0;