Permalink
Browse files

Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'

* commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7':
  avserver: do not use a static string as a default for a string option

See: 19c41c6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information...
michaelni committed Aug 6, 2013
2 parents a7bb12a + 612a504 commit 4131f21f7761d911e5e1b1f44068b652872e454f
Showing with 2 additions and 3 deletions.
  1. +2 −3 ffserver.c
View
@@ -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());

0 comments on commit 4131f21

Please sign in to comment.