summaryrefslogtreecommitdiffstats
path: root/demux/demux.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-27 10:55:59 +0200
committerwm4 <wm4@nowhere>2014-08-27 10:59:22 +0200
commitdad90f616da5665e6e27a516f78c2a5fa66162c2 (patch)
tree1dbf9ee388dfe35c5baa0fccaa9ab6e7cc5172f2 /demux/demux.c
parent0b428e44829abc4387f051e3c618c1c878b3a838 (diff)
downloadmpv-dad90f616da5665e6e27a516f78c2a5fa66162c2.tar.bz2
mpv-dad90f616da5665e6e27a516f78c2a5fa66162c2.tar.xz
player: fix basic playback
The "buffering" logic was active even if the stream cache was disabled. This is contrary to what the manpage says. It also breaks playback because of another bug: the demuxer cache is smaller than 2 seconds, and thus the resume condition never becomes true. Explicitly run this code only if the stream cache is enabled. Also, fix the underlying problem of the breakage, and resume when the demuxer thread stops reading in any case, not just on EOF. Broken by previous commit. Unbreaks playback of local files.
Diffstat (limited to 'demux/demux.c')
-rw-r--r--demux/demux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 2560a0736d..c62c0754b8 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -1185,7 +1185,7 @@ static int cached_demux_control(struct demux_internal *in, int cmd, void *arg)
r->ts_range[1] = MP_PTS_MIN(r->ts_range[1], ds->last_ts);
}
}
- r->idle &= !r->underrun;
+ r->idle = (r->idle && !r->underrun) || r->eof;
return DEMUXER_CTRL_OK;
}
}