From: Stefano Sabatini <stefasab@gmail.com>
Date: Thu, 28 Nov 2013 22:53:10 +0000 (+0100)
Subject: doc/ffserver: mention remaining stream options
X-Git-Tag: android-x86-6.0-r1~8683
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d1daa71f9d22756fa5bd6690e9f5fc31c94b1490;p=android-x86%2Fexternal-ffmpeg.git

doc/ffserver: mention remaining stream options
---

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index a4ddf3282a..b551fdfb90 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -411,6 +411,18 @@ A value of 0 means that no limit is set on the stream duration.
 @item ACL @var{spec}
 Set ACL for the stream.
 
+@item DynamicACL @var{spec}
+
+@item RTSPOtion @var{option}
+
+@item MulticastAddress @var{address}
+
+@item MulticastPort @var{port}
+
+@item MulticastTTL @var{integer}
+
+@item NoLoop
+
 @item FaviconURL @var{url}
 Set favicon (favourite icon) for the server status page. It is ignored
 for regular streams.