diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 09:05:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 09:13:51 +0200 |
| commit | 4131f21f7761d911e5e1b1f44068b652872e454f (patch) | |
| tree | b798a257be175716ca739947498c4c03722c4f39 /ffserver.c | |
| parent | a7bb12a307568c0db72e6eb8d496a5651a8228df (diff) | |
| parent | 612a5049d9b4ac1c2a293daf75fe814b7a94fdc7 (diff) | |
| download | ffmpeg-4131f21f7761d911e5e1b1f44068b652872e454f.tar.gz | |
Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'
* commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7':
avserver: do not use a static string as a default for a string option
See: 19c41c6d8ef6cc34cfde6bf877e059689e763bb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c index 30cc481849..cfa730a81a 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4673,6 +4673,8 @@ int main(int argc, char **argv) { struct sigaction sigact = { { 0 } }; + config_filename = av_strdup("/etc/ffserver.conf"); + parse_loglevel(argc, argv, options); av_register_all(); avformat_network_init(); @@ -4683,9 +4685,6 @@ int main(int argc, char **argv) parse_options(NULL, argc, argv, options, NULL); - if (!config_filename) - config_filename = av_strdup("/etc/ffserver.conf"); - unsetenv("http_proxy"); /* Kill the http_proxy */ av_lfg_init(&random_state, av_get_random_seed()); |