highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-08-06 09:05:13 +02:00
commit 4131f21f77
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffserver.c
View File

@ -4673,6 +4673,8 @@ int main(int argc, char **argv)
{ {
struct sigaction sigact = { { 0 } }; struct sigaction sigact = { { 0 } };
config_filename = av_strdup("/etc/ffserver.conf");
parse_loglevel(argc, argv, options); parse_loglevel(argc, argv, options);
av_register_all(); av_register_all();
avformat_network_init(); avformat_network_init();
@ -4683,9 +4685,6 @@ int main(int argc, char **argv)
parse_options(NULL, argc, argv, options, NULL); parse_options(NULL, argc, argv, options, NULL);
if (!config_filename)
config_filename = av_strdup("/etc/ffserver.conf");
unsetenv("http_proxy"); /* Kill the http_proxy */ unsetenv("http_proxy"); /* Kill the http_proxy */
av_lfg_init(&random_state, av_get_random_seed()); av_lfg_init(&random_state, av_get_random_seed());