Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:05:13 +0000 (09:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:13:51 +0000 (09:13 +0200)
* 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>
1  2 
ffserver.c

diff --cc ffserver.c
index 30cc481849be244f29aef2e9fbd2909129f0707e,56bcda9d4df7992f24af0e0ede802b0a32fdde13..cfa730a81ae0810bac4bcd5a2b180dea3a1bf16c
@@@ -4673,6 -4633,8 +4673,8 @@@ int main(int argc, char **argv
  {
      struct sigaction sigact = { { 0 } };
  
 -    config_filename = av_strdup("/etc/avserver.conf");
++    config_filename = av_strdup("/etc/ffserver.conf");
      parse_loglevel(argc, argv, options);
      av_register_all();
      avformat_network_init();