diff options
author | wm4 <wm4@nowhere> | 2019-11-07 14:47:54 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2019-11-07 22:53:10 +0100 |
commit | 12d17610645c1d1c2d5bd92cd66a604bb2c754dd (patch) | |
tree | a2c4e11d684d206de7cf1109149f0c642bd990d5 | |
parent | 8a0929973de15d9574595c5a098bb3446757ef16 (diff) | |
download | mpv-12d17610645c1d1c2d5bd92cd66a604bb2c754dd.tar.bz2 mpv-12d17610645c1d1c2d5bd92cd66a604bb2c754dd.tar.xz |
stream: remove eof getter
demux_mkv was the only thing using this, and everything else accessed it
directly. No need to keep the indirection wrapper around.
(Funny how this getter was in the initial commit of MPlayer.)
-rw-r--r-- | demux/demux_mkv.c | 2 | ||||
-rw-r--r-- | stream/stream.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index db1ccff13a..bd36edb784 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -2137,7 +2137,7 @@ static int demux_mkv_read_block_lacing(struct block_info *block, int type, uint8_t t; do { t = stream_read_char(s); - if (stream_eof(s) || stream_tell(s) >= endpos) + if (s->eof || stream_tell(s) >= endpos) goto error; lace_size[i] += t; } while (t == 0xFF); diff --git a/stream/stream.h b/stream/stream.h index 7dbcd833a4..cc7fcbb2f0 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -188,11 +188,6 @@ inline static int stream_read_char(stream_t *s) int stream_skip_bom(struct stream *s); -inline static int stream_eof(stream_t *s) -{ - return s->eof; -} - inline static int64_t stream_tell(stream_t *s) { return s->pos + s->buf_cur - s->buf_end; |