[FFmpeg-cvslog] ffserver: put NoDaemon back so as not not break existing conf files.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 16 13:12:09 2012 +0100| [f30cf51d46348a43175041df014049d1fa51ed36] | committer: Michael Niedermayer

ffserver: put NoDaemon back so as not not break existing conf files.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f30cf51d46348a43175041df014049d1fa51ed36
---

 ffserver.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffserver.c b/ffserver.c
index 1a06109..5d97bdd 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);