diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-21 03:23:51 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-21 03:23:51 +0000 |
| commit | 1ad8289edece30c4a2c51ad24f093e5421e41ab9 (patch) | |
| tree | f025d034b702d3b9cbe8469c0cfe5e5962598c76 /ffserver.c | |
| parent | 9507a12e42a45b9b82f72f7484c4ebe1a031a99b (diff) | |
upgrade bandwidth to uint64_t
Originally committed as revision 13841 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c index 2b5e6c8fdc..a061cfa9a1 100644 --- a/ffserver.c +++ b/ffserver.c @@ -295,8 +295,8 @@ static int need_to_start_children; static int nb_max_connections; static int nb_connections; -static int max_bandwidth; -static int current_bandwidth; +static uint64_t max_bandwidth; +static uint64_t current_bandwidth; static int64_t cur_time; // Making this global saves on passing it around everywhere @@ -1315,7 +1315,7 @@ static int http_parse_request(HTTPContext *c) q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<html><head><title>Too busy</title></head><body>\r\n"); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The server is too busy to serve your request at this time.</p>\r\n"); - q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The bandwidth being served (including your stream) is %dkbit/sec, and this exceeds the limit of %dkbit/sec.</p>\r\n", + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<p>The bandwidth being served (including your stream) is %lldkbit/sec, and this exceeds the limit of %lldkbit/sec.</p>\r\n", current_bandwidth, max_bandwidth); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "</body></html>\r\n"); @@ -1811,7 +1811,7 @@ static void compute_status(HTTPContext *c) url_fprintf(pb, "Number of connections: %d / %d<BR>\n", nb_connections, nb_max_connections); - url_fprintf(pb, "Bandwidth in use: %dk / %dk<BR>\n", + url_fprintf(pb, "Bandwidth in use: %lldk / %lldk<BR>\n", current_bandwidth, max_bandwidth); url_fprintf(pb, "<TABLE>\n"); |