[FFmpeg-cvslog] doc/ffserver: clarify/extend documentation about status streams

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Nov 28 19:33:07 2013 +0100| [bcbf8920ede18859031773138bf5168ed0e362b9] | committer: Stefano Sabatini

doc/ffserver: clarify/extend documentation about status streams

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

 doc/ffserver.texi |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 64bc514..509bf24 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -377,12 +377,13 @@ The following options are recognized within a Stream section.
 @item Feed @var{feed_name}
 Set the input feed.
 
-Must be specified.
+Must be specified for regular streams.
 
 @item Format @var{format_name}
-Set the format of the stream.
+Set the format of the output stream.
 
-Must be the name of a format recognized by FFmpeg.
+Must be the name of a format recognized by FFmpeg. If set to
+ at samp{status}, it is treated as a status stream.
 
 @item AudioBitRate @var{rate}
 Set bitrate for the audio stream in KB per second.
@@ -482,7 +483,7 @@ A server status stream is a special stream which is used to show
 statistics about the @command{ffserver} operations.
 
 It must be specified setting the option @option{Format} to
- at code{status}.
+ at samp{status}.
 
 @section Redirect section