From ff08d0c34af0dda7913445cf73e39a549658ab1f Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 22 Aug 2012 18:24:56 +0000 Subject: stream_file: explicitly signal EOF Explicitly signal EOF when reaching the end of a file/pipe. Fixes a 4 second delay due to stream_reconnect for e.g. echo | mplayer - git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35112 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_file.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'stream') diff --git a/stream/stream_file.c b/stream/stream_file.c index dfafb773f0..20d2a85497 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -55,6 +55,8 @@ static const struct m_struct_st stream_opts = { static int fill_buffer(stream_t *s, char* buffer, int max_len){ int r = read(s->fd,buffer,max_len); + // We are certain this is EOF, do not retry + if (max_len && r == 0) s->eof = 1; return (r <= 0) ? -1 : r; } -- cgit v1.2.3