diff options
| author | Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com> | 2014-02-08 00:19:39 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com> | 2014-02-08 00:30:29 -0300 |
| commit | 958d98cc1cac9528c3b6089c620fdaaceaeb6726 (patch) | |
| tree | 83e790caf30e1d20d7ccfc447e46d1c7dbf0b1a8 | |
| parent | db93c2d03131253f12b2886ad779f65c6bfb8a46 (diff) | |
| download | ffmpeg-958d98cc1cac9528c3b6089c620fdaaceaeb6726.tar.gz | |
ffserver: drop unneeded delay1 var
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
| -rw-r--r-- | ffserver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c index 73c4109acc..00b4857cf4 100644 --- a/ffserver.c +++ b/ffserver.c @@ -637,7 +637,7 @@ static void start_multicast(void) static int http_server(void) { int server_fd = 0, rtsp_server_fd = 0; - int ret, delay, delay1; + int ret, delay; struct pollfd *poll_table, *poll_entry; HTTPContext *c, *c_next; @@ -711,9 +711,9 @@ static int http_server(void) /* when ffserver is doing the timing, we work by looking at which packet needs to be sent every 10 ms */ - delay1 = 10; /* one tick wait XXX: 10 ms assumed */ - if (delay1 < delay) - delay = delay1; + /* one tick wait XXX: 10 ms assumed */ + if (delay > 10) + delay = 10; } break; case HTTPSTATE_WAIT_REQUEST: |