ffserver: deprecate inconsistent parsing behavior of Truncate option

Also make it accept the more consistent behavior (boolean option set to
true when specified).

diff --git a/ffserver.c b/ffserver.c
index a900b94..6ce09c4 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -4232,7 +4232,15 @@ static int parse_ffconfig(const char *filename)
         } else if (!av_strcasecmp(cmd, "Truncate")) {
             if (feed) {
                 get_arg(arg, sizeof(arg), &p);
-                feed->truncate = strtod(arg, NULL);
+                /* assume Truncate is true in case no argument is specified */
+                if (!arg[0]) {
+                    feed->truncate = 1;
+                } else {
+                    av_log(NULL, AV_LOG_WARNING,
+                           "Truncate N syntax in configuration file is deprecated, "
+                           "use Truncate alone with no arguments\n");
+                    feed->truncate = strtod(arg, NULL);
+                }
             }
         } else if (!av_strcasecmp(cmd, "FileMaxSize")) {
             if (feed) {