summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-11-27 14:04:41 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-11-27 15:48:19 +0100
commit6b58488f926af1fa38ceb189e891c2d5925f4633 (patch)
tree6d7d6dec0f65a9d6a9ea6eb59f3e44d0017e9f7a /doc
parent8adaee56c414fe924de4f94b5f7c5d3e3ecf89f9 (diff)
doc/ffmpeg: use @command{} for programs mentioned in -override_ffserver
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg.texi12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 18a858baa4..0a930cebf8 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1113,12 +1113,14 @@ transcoding. Use @option{-noaccurate_seek} to disable it, which may be useful
e.g. when copying some streams and transcoding the others.
@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.
+Overrides the input specifications from @command{ffserver}. Using this
+option you can map any input stream to @command{ffserver} and control
+many aspects of the encoding from @command{ffmpeg}. Without this
+option @command{ffmpeg} will transmit to @command{ffserver} what is
+requested by @command{ffserver}.
+
The option is intended for cases where features are needed that cannot be
-specified to ffserver but can be to ffmpeg.
+specified to @command{ffserver} but can be to @command{ffmpeg}.
@end table