aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-08-21 01:42:47 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-08-21 10:04:30 +0200
commit10c3329627262044b902cb2bef1f265f31b772d9 (patch)
tree4b2dccc421f124a005c8b8f1b8faef77af96ae13
parent62527dc245456b643f2991b32b9aea3a882a2399 (diff)
downloadffmpeg-10c3329627262044b902cb2bef1f265f31b772d9.tar.gz
doc/ffmpeg: extend documentation for -(no)stdin option
Fix trac ticket #1665.
-rw-r--r--doc/ffmpeg.texi10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index ec8bed3c9d..49d2c0e76c 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -363,11 +363,13 @@ progress information is always "progress".
@item -stdin
Enable interaction on standard input. On by default unless standard input is
-used as an input.
+used as an input. To explicitly disable interaction you need to specify
+@code{-nostdin}.
-Useful, for example, if ffmpeg is in the background process group. Roughly
-the same result can be achieved with @code{ffmpeg ... < /dev/null} but it
-requires a shell.
+Disabling interaction on standard input is useful, for example, if
+ffmpeg is in the background process group. Roughly the same result can
+be achieved with @code{ffmpeg ... < /dev/null} but it requires a
+shell.
@item -debug_ts (@emph{global})
Print timestamp information. It is off by default. This option is