From d854c5c06a45b04c8abb7e84b267b00a59a01a7d Mon Sep 17 00:00:00 2001
From: michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 11 Apr 2004 15:04:54 +0000
Subject: [PATCH] nicer EOF solution, mpeg-ps works now too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12167 b3059339-0415-0410-9bf9-f77b7e298cf2
---
libmpdemux/demux_lavf.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 99096f8c4f..1a92212385 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -57,8 +57,7 @@ static int mp_read(URLContext *h, unsigned char *buf, int size){
if(stream_eof(stream)) //needed?
return -1;
ret=stream_read(stream, buf, size);
- if(ret>0)
- stream->eof=0;
+
mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), eof:%d\n", ret, h, buf, size, stream->eof);
return ret;
}
@@ -78,10 +77,11 @@ static offset_t mp_seek(URLContext *h, offset_t pos, int whence){
else if(whence != SEEK_SET)
return -1;
+ if(pos<stream->end_pos)
+ stream_reset(stream);
if(stream_seek(stream, pos)==0)
return -1;
- if(pos==stream->end_pos)
- stream->eof=0;
+
return pos;
}