From: Stefano Sabatini Date: Thu, 28 Nov 2013 18:33:07 +0000 (+0100) Subject: doc/ffserver: clarify/extend documentation about status streams X-Git-Tag: android-x86-6.0-r1~8704 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bcbf8920ede18859031773138bf5168ed0e362b9;p=android-x86%2Fexternal-ffmpeg.git doc/ffserver: clarify/extend documentation about status streams --- diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 64bc514a64..509bf246b6 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 +@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 -@code{status}. +@samp{status}. @section Redirect section