Merge svn changes up to r31226

1 files changed, 4 insertions, 1 deletions

diff --git a/stream/stream.c b/stream/stream.c
index 80e37369f7..165166245d 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -260,7 +260,7 @@ stream_t *open_output_stream(const char *filename, struct MPOpts *options)
 
 int stream_fill_buffer(stream_t *s){
   int len;
-  if (/*s->fd == NULL ||*/ s->eof) { return 0; }
+  // we will retry even if we already reached EOF previously.
   switch(s->type){
   case STREAMTYPE_STREAM:
 #ifdef CONFIG_NETWORK
@@ -282,6 +282,9 @@ int stream_fill_buffer(stream_t *s){
     len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0;
   }
   if(len<=0){ s->eof=1; return 0; }
+  // When reading succeeded we are obviously not at eof.
+  // This e.g. avoids issues with eof getting stuck when lavf seeks in MPEG-TS
+  s->eof=0;
   s->buf_pos=0;
   s->buf_len=len;
   s->pos+=len;