aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-07-25 11:59:34 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-07-25 11:59:34 +0000
commit53e2f9caf80ed385a3d4cfb9200d8827b65580ef (patch)
tree821ceae2581e009ac37615348e25a5be6f6c4578 /ffserver.c
parentebb177ddef238db201a2bbbf0db21a6d7fbeba32 (diff)
downloadffmpeg-53e2f9caf80ed385a3d4cfb9200d8827b65580ef.tar.gz
ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
Originally committed as revision 3340 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index 7423abc07b..cb195ef88e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -600,7 +600,9 @@ static int http_server(void)
second to handle timeouts */
do {
ret = poll(poll_table, poll_entry - poll_table, delay);
- } while (ret == -1);
+ if (ret < 0 && errno != EAGAIN && errno != EINTR)
+ return -1;
+ } while (ret <= 0);
cur_time = gettime_ms();