diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-16 16:12:09 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-16 16:12:09 +0400 |
commit | f30cf51d46348a43175041df014049d1fa51ed36 (patch) | |
tree | 16b35d88fd0c71286ecd85c5a5991ec0cb3ce297 | |
parent | 3db32ec119e5a7811e7ee1d41e3becc261fbb296 (diff) |
ffserver: put NoDaemon back so as not not break existing conf files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffserver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ffserver.c b/ffserver.c index 1a06109e67..5d97bdde91 100644 --- a/ffserver.c +++ b/ffserver.c @@ -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); |