diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-21 20:53:12 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-22 06:40:34 +0300 |
commit | de5566f0b5420fbdbf0dc37f225be01cfd04cf66 (patch) | |
tree | 5a2b96c91493a1c8b8e01f378da844f6c08cd6f9 | |
parent | de42015a97cf296aad6307adcfb2750e1ab88800 (diff) | |
download | mpv-de5566f0b5420fbdbf0dc37f225be01cfd04cf66.tar.bz2 mpv-de5566f0b5420fbdbf0dc37f225be01cfd04cf66.tar.xz |
stream.h: remove bad EOF check in stream_seek()
Also remove a redundant stream->eof = 0 in demuxer.c.
-rw-r--r-- | libmpdemux/demuxer.c | 1 | ||||
-rw-r--r-- | stream/stream.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 1930cf3488..14d2c85f67 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -243,7 +243,6 @@ demuxer_t *new_demuxer(struct MPOpts *opts, stream_t *stream, int type, "big troubles ahead."); if (filename) // Filename hack for avs_check_file d->filename = strdup(filename); - stream->eof = 0; stream_seek(stream, stream->start_pos); return d; } diff --git a/stream/stream.h b/stream/stream.h index d46730bd80..5cbc304e81 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -289,8 +289,6 @@ inline static int stream_seek(stream_t *s,off_t pos){ mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%qX\n",(long long)pos); - if(s->eof) - return 0; if(pos<s->pos){ off_t x=pos-(s->pos-s->buf_len); if(x>=0){ |