ffserver: factorize code setting ReadOnlyFile/File options

77f5cb92 · Stefano Sabatini · 0e1e5d00 · 77f5cb92
Commit 77f5cb92 authored Nov 28, 2013 by Stefano Sabatini
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

ffserver.c ffserver.c +2 -7

No files found.
--- a/ffserver.c
+++ b/ffserver.c
@@ -4209,18 +4209,13 @@ static int parse_ffconfig(const char *filename)
                    goto end;
                }
            }
-        } else if (!av_strcasecmp(cmd, "ReadOnlyFile")) {
+        } else if (!av_strcasecmp(cmd, "File") || !av_strcasecmp(cmd, "ReadOnlyFile")) {
            if (feed) {
                get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
-                feed->readonly = 1;
+                feed->readonly = !av_strcasecmp(cmd, "ReadOnlyFile");
            } else if (stream) {
                get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
            }
-        } else if (!av_strcasecmp(cmd, "File")) {
-            if (feed) {
-                get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
-            } else if (stream)
-                get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
        } else if (!av_strcasecmp(cmd, "Truncate")) {
            if (feed) {
                get_arg(arg, sizeof(arg), &p);