ffserver: put NoDaemon back so as not not break existing conf files.
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Nov 2012 12:12:09 +0000 (13:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Nov 2012 12:12:09 +0000 (13:12 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffserver.c

index 1a06109..5d97bdd 100644 (file)
@@ -4114,6 +4114,8 @@ static int parse_ffconfig(const char *filename)
             if (resolve_host(&my_http_addr.sin_addr, arg) != 0) {
                 ERROR("%s:%d: Invalid host/IP address: %s\n", arg);
             }
+        } else if (!av_strcasecmp(cmd, "NoDaemon")) {
+            // do nothing here, its the default now
         } else if (!av_strcasecmp(cmd, "RTSPPort")) {
             get_arg(arg, sizeof(arg), &p);
             val = atoi(arg);