virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

merge declaration and init

Browse Source 
Originally committed as revision 13861 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2008-06-22 00:54:25 +00:00
parent 2b9cd1e78a
commit f69bb0cc1c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ffserver.c
View File

@@ -292,10 +292,10 @@ static int ffserver_daemon;
static int no_launch; static int no_launch;
static int need_to_start_children; static int need_to_start_children;
static int nb_max_connections; static int nb_max_connections = 5;
static int nb_connections; static int nb_connections;
static uint64_t max_bandwidth; static uint64_t max_bandwidth = 1000;
static uint64_t current_bandwidth; static uint64_t current_bandwidth;
static int64_t cur_time; // Making this global saves on passing it around everywhere 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); av_init_random(av_gettime() + (getpid() << 16), &random_state);
nb_max_connections = 5;
max_bandwidth = 1000;
first_stream = NULL; first_stream = NULL;
memset(&sigact, 0, sizeof(sigact)); memset(&sigact, 0, sizeof(sigact));