[FFmpeg-cvslog] doc/ffserver: document InputFormat stream option

Stefano Sabatini git at videolan.org
Thu Nov 28 23:15:56 CET 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Nov 28 21:06:28 2013 +0100| [2a0349786a58180ff21a40d71cc64860ead66645] | committer: Stefano Sabatini

doc/ffserver: document InputFormat stream option

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

 doc/ffserver.texi |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index a70e231..7a20aea 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -385,6 +385,9 @@ Set the format of the output stream.
 Must be the name of a format recognized by FFmpeg. If set to
 @samp{status}, it is treated as a status stream.
 
+ at item InputFormat @var{format_name}
+Set input format. If not specified, it is automatically guessed.
+
 @item AudioBitRate @var{rate}
 Set bitrate for the audio stream in KB per second.
 



More information about the ffmpeg-cvslog mailing list