aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-11-28 21:06:08 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-11-29 10:28:03 +0100
commitf87e189ee0d26399add10f2a8b11260b3d6fb11d (patch)
tree3cbbcddbb63b9880cb63181b1e1145c16d6371c4
parentb1049f89fa48ae9b038516a7194686eebaa25be7 (diff)
downloadffmpeg-f87e189ee0d26399add10f2a8b11260b3d6fb11d.tar.gz
doc/ffserver: extend documentation for various file-related options
-rw-r--r--doc/ffserver.texi20
1 files changed, 16 insertions, 4 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index b551fdfb90..57aeca8da3 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -327,13 +327,25 @@ The following options are recognized within a Feed section.
@table @option
@item File @var{filename}
-Set the path where the file is stored on disk.
+@item ReadOnlyFile @var{filename}
+Set the path where the feed file is stored on disk.
+
+If not specified, the @file{/tmp/FEED.ffm} is assumed, where
+@var{FEED} is the feed name.
+
+If @option{ReadOnlyFile} is used the file is marked as read-only and
+it will not be deleted or updated.
+
+@item Truncate
+Truncate the feed file, rather than appending to it. By default
+@command{ffserver} will append data to the file, until the maximum
+file size value is reached (see @option{FileMaxSize} option).
@item FileMaxSize @var{size}
-Set maximum size of the feed. 0 means unlimited.
+Set maximum size of the feed. 0 means unlimited. The postfixes
+@code{K}, @code{M}, and @code{G} are recognized.
-@item ReadOnlyFile @var{filename}
-Mark the file as readonly and it will not be deleted or updated.
+Default value is 5M.
@item Launch @var{args}
Launch an @command{ffmpeg} command when creating @command{ffserver}.