diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-24 10:39:25 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-24 10:39:25 +0000 |
| commit | 6675a5bf73cb4d01617284f774d332c068add3b3 (patch) | |
| tree | acfbdc407e12b1ec05bb6cc9541f44e2b7922a39 | |
| parent | 931b832add92a15473cc3218129368053b129ed0 (diff) | |
| download | ffmpeg-6675a5bf73cb4d01617284f774d332c068add3b3.tar.gz | |
Statically initialize ffserver.c:config_filename, simplify.
Originally committed as revision 22959 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffserver.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c index 6e4b4e0b04..eb51746f13 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; |