[FFmpeg-cvslog] doc/ffmpeg: document -override_ffserver

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  9 21:42:27 2013 +0200| [e9be4675b88ac9c9c69f452d89b2d0f4d626cb70] | committer: Michael Niedermayer

doc/ffmpeg: document -override_ffserver

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 doc/ffmpeg.texi |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 7504b3a..50b2c8b 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1060,6 +1060,14 @@ This option is similar to @option{-filter_complex}, the only difference is that
 its argument is the name of the file from which a complex filtergraph
 description is to be read.
 
+ at item -override_ffserver (@emph{global})
+Overrides the input specifications from ffserver. Using this option you can
+map any input stream to ffserver and control many aspects of the encoding from
+ffmpeg. Without this option ffmpeg will transmit to ffserver what is requested by
+ffserver.
+The option is intended for cases where features are needed that cannot be
+specified to ffserver but can be to ffmpeg.
+
 @end table
 
 As a special exception, you can use a bitmap subtitle stream as input: it