diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-05 23:34:17 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-05 23:35:42 +0300 |
commit | dde8b753e417bb44e5f18ac9d6901deb95bf6ab0 (patch) | |
tree | 84fc2a73fc1f514417cacd61c9a57580ca47cd66 /libmpdemux/demux_lavf.c | |
parent | 331167ae132d35c821510307d8dd109ce27bfc1b (diff) | |
parent | 09bca6575f66394e1f4ba3845330d21d30895f3d (diff) | |
download | mpv-dde8b753e417bb44e5f18ac9d6901deb95bf6ab0.tar.bz2 mpv-dde8b753e417bb44e5f18ac9d6901deb95bf6ab0.tar.xz |
Merge svn changes r31318 to r31328
r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...
Diffstat (limited to 'libmpdemux/demux_lavf.c')
-rw-r--r-- | libmpdemux/demux_lavf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 497ff563bf..ec8075d219 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -80,11 +80,10 @@ static int mp_read(void *opaque, uint8_t *buf, int size) { struct stream *stream = demuxer->stream; int ret; - if(stream_eof(stream)) //needed? - return -1; ret=stream_read(stream, buf, size); - mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), eof:%d\n", ret, stream, buf, size, stream->eof); + mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), pos: %"PRId64", eof:%d\n", + ret, stream, buf, size, stream_tell(stream), stream->eof); return ret; } @@ -106,8 +105,6 @@ static int64_t mp_seek(void *opaque, int64_t pos, int whence) { if(pos<0) return -1; - if(pos<stream->end_pos && stream->eof) - stream_reset(stream); current_pos = stream_tell(stream); if(stream_seek(stream, pos)==0) { stream_reset(stream); |