From e9be4675b88ac9c9c69f452d89b2d0f4d626cb70 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 9 Jul 2013 21:42:27 +0200 Subject: doc/ffmpeg: document -override_ffserver Signed-off-by: Michael Niedermayer --- doc/ffmpeg.texi | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 7504b3a3fd..50b2c8b8f0 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. +@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 -- cgit v1.2.3