diff options
-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; |