mirror of https://git.ffmpeg.org/ffmpeg.git
Statically initialize ffserver.c:config_filename, simplify.
Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
931b832add
commit
6675a5bf73
|
@ -293,7 +293,8 @@ static int rtp_new_av_stream(HTTPContext *c,
|
||||||
static const char *my_program_name;
|
static const char *my_program_name;
|
||||||
static const char *my_program_dir;
|
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_debug;
|
||||||
static int ffserver_daemon;
|
static int ffserver_daemon;
|
||||||
static int no_launch;
|
static int no_launch;
|
||||||
|
@ -4647,8 +4648,6 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
show_banner();
|
show_banner();
|
||||||
|
|
||||||
config_filename = "/etc/ffserver.conf";
|
|
||||||
|
|
||||||
my_program_name = argv[0];
|
my_program_name = argv[0];
|
||||||
my_program_dir = getcwd(0, 0);
|
my_program_dir = getcwd(0, 0);
|
||||||
ffserver_daemon = 1;
|
ffserver_daemon = 1;
|
||||||
|
|
Loading…
Reference in New Issue