Merge commit '4d8d16b596c63de85e52488734338fbb41238058'

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index e7ec17098ca1d9c8a4175fdad7cf2696a3704433..cfa730a81ae0810bac4bcd5a2b180dea3a1bf16c 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -36,6 +36,7 @@
 #include "libavformat/network.h"
 #include "libavformat/os_support.h"
 #include "libavformat/rtpdec.h"
+#include "libavformat/rtpproto.h"
 #include "libavformat/rtsp.h"
 #include "libavformat/avio_internal.h"
 #include "libavformat/internal.h"
@@ -4672,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();
@@ -4682,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());