[FFmpeg-cvslog] ffserver: drop unneeded delay1 var

[Reynaldo H. Verdejo Pinochet]

ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <r.verdejo at sisa.samsung.com> | Sat Feb  8 00:19:39 2014 -0300| [958d98cc1cac9528c3b6089c620fdaaceaeb6726] | committer: Reynaldo H. Verdejo Pinochet

ffserver: drop unneeded delay1 var

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo at sisa.samsung.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=958d98cc1cac9528c3b6089c620fdaaceaeb6726
---

 ffserver.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 73c4109..00b4857 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: