[FFmpeg-cvslog] ffserver: factorize code setting ReadOnlyFile/File options

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Nov 28 21:05:31 2013 +0100| [77f5cb92aff4e319f6dd804e959d466cee63c4fb] | committer: Stefano Sabatini

ffserver: factorize code setting ReadOnlyFile/File options

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

 ffserver.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 4b70dc2..1623425 100644
--- 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);