github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-09-12 23:45:53 +02:00
Code Releases Activity

stream: set EOF if stream is canceled

Browse Source 
Commit 7be495b3 added the cancellation test, but forgot to set the eof
flag. This could lead to demux_mkv.c not terminating if the stream was
cancelled in some code paths.

This function is what is supposed to set the EOF flag in the first
place, so just add the missing code.
This commit is contained in:
wm4 2017-01-26 18:27:30 +01:00
parent abc6d130ac
commit 4e53f9e5b2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stream/stream.c
View File

@ -361,8 +361,10 @@ static int stream_read_unbuffered(stream_t *s, void *buf, int len)
{
int orig_len = len;
s->buf_pos = s->buf_len = 0;
if (mp_cancel_test(s->cancel))
if (mp_cancel_test(s->cancel)) {
s->eof = 1;
return 0;
}
// we will retry even if we already reached EOF previously.
len = s->fill_buffer ? s->fill_buffer(s, buf, len) : -1;
if (len < 0)