From: Baptiste Coudurier Date: Sun, 22 Jun 2008 00:54:25 +0000 (+0000) Subject: merge declaration and init X-Git-Tag: v0.5~4057 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f69bb0cc1c06afa0ac390b2ceb4af9c34866d3f2;p=coroid%2Flibav_saccubus.git merge declaration and init Originally committed as revision 13861 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/ffserver.c b/ffserver.c index f40f229c7..bf95a88ff 100644 --- a/ffserver.c +++ b/ffserver.c @@ -292,10 +292,10 @@ static int ffserver_daemon; static int no_launch; static int need_to_start_children; -static int nb_max_connections; +static int nb_max_connections = 5; static int nb_connections; -static uint64_t max_bandwidth; +static uint64_t max_bandwidth = 1000; static uint64_t current_bandwidth; static int64_t cur_time; // Making this global saves on passing it around everywhere @@ -4463,8 +4463,6 @@ int main(int argc, char **argv) av_init_random(av_gettime() + (getpid() << 16), &random_state); - nb_max_connections = 5; - max_bandwidth = 1000; first_stream = NULL; memset(&sigact, 0, sizeof(sigact));