[FFmpeg-cvslog] r17516 - trunk/ffserver.c

[bcoudurier]

Author: bcoudurier
Date: Sun Feb 22 03:06:55 2009
New Revision: 17516

Log:
add bandwidth before failing if feed is already being received

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Sun Feb 22 03:04:24 2009	(r17515)
+++ trunk/ffserver.c	Sun Feb 22 03:06:55 2009	(r17516)
@@ -1355,6 +1355,9 @@ static int http_parse_request(HTTPContex
         }
     }
 
+    if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE)
+        current_bandwidth += stream->bandwidth;
+
     /* If already streaming this feed, do not let start another feeder. */
     if (stream->feed_opened) {
         snprintf(msg, sizeof(msg), "This feed is already being received.");
@@ -1362,9 +1365,6 @@ static int http_parse_request(HTTPContex
         goto send_error;
     }
 
-    if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE)
-        current_bandwidth += stream->bandwidth;
-
     if (c->post == 0 && max_bandwidth < current_bandwidth) {
         c->http_error = 200;
         q = c->buffer;