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

[stefano]

Author: stefano
Date: Sat Apr 24 12:39:25 2010
New Revision: 22959

Log:
Statically initialize ffserver.c:config_filename, simplify.

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Sat Apr 24 12:14:05 2010	(r22958)
+++ trunk/ffserver.c	Sat Apr 24 12:39:25 2010	(r22959)
@@ -293,7 +293,8 @@ static int rtp_new_av_stream(HTTPContext
 static const char *my_program_name;
 static const char *my_program_dir;
 
-static const char *config_filename;
+static const char *config_filename = "/etc/ffserver.conf";
+
 static int ffserver_debug;
 static int ffserver_daemon;
 static int no_launch;
@@ -4647,8 +4648,6 @@ int main(int argc, char **argv)
 
     show_banner();
 
-    config_filename = "/etc/ffserver.conf";
-
     my_program_name = argv[0];
     my_program_dir = getcwd(0, 0);
     ffserver_daemon = 1;