projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
931b832
)
Statically initialize ffserver.c:config_filename, simplify.
author
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Sat, 24 Apr 2010 10:39:25 +0000
(10:39 +0000)
committer
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Sat, 24 Apr 2010 10:39:25 +0000
(10:39 +0000)
Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver.c
patch
|
blob
|
history
diff --git
a/ffserver.c
b/ffserver.c
index
6e4b4e0
..
eb51746
100644
(file)
--- 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;