diff options
author | wm4 <wm4@nowhere> | 2013-06-06 20:40:02 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-16 22:05:10 +0200 |
commit | 0d5e6084aed34a9e6f48a4a2cfaf095b17acb21b (patch) | |
tree | 8513c329707016173c6b482961cf721b81b5bfc7 /stream/stream_cdda.c | |
parent | 1c35794efd7d025457e527b61f7c23fe375c2f5a (diff) | |
download | mpv-0d5e6084aed34a9e6f48a4a2cfaf095b17acb21b.tar.bz2 mpv-0d5e6084aed34a9e6f48a4a2cfaf095b17acb21b.tar.xz |
stream: don't set EOF flag in stream implementations
EOF should be set when reading more data fails. The stream
implementations have nothing to say here and should behave correctly
when trying to read when EOF was actually read.
Even when seeking, a correct EOF flag should be guaranteed. stream_seek()
(or actually stream_seek_long()) calls stream_fill_buffer() at least
once, which also updates the EOF flag.
Diffstat (limited to 'stream/stream_cdda.c')
-rw-r--r-- | stream/stream_cdda.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 1bec7dcc37..c19c71d64f 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -200,7 +200,6 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len) return -1; if ((p->sector < p->start_sector) || (p->sector > p->end_sector)) { - s->eof = 1; return 0; } @@ -237,7 +236,6 @@ static int seek(stream_t *s, int64_t newpos) s->pos = newpos; sec = s->pos / CDIO_CD_FRAMESIZE_RAW; if (s->pos < 0 || sec > p->end_sector) { - s->eof = 1; p->sector = p->end_sector + 1; return 0; } |