From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sat, 24 Apr 2010 10:39:25 +0000 (+0000)
Subject: Statically initialize ffserver.c:config_filename, simplify.
X-Git-Tag: v0.6~165
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6675a5bf73cb4d01617284f774d332c068add3b3;p=platform%2Fupstream%2Flibav.git

Statically initialize ffserver.c:config_filename, simplify.

Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/ffserver.c b/ffserver.c
index 6e4b4e0..eb51746 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -293,7 +293,8 @@ static int rtp_new_av_stream(HTTPContext *c,
 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;