summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-07-11 21:10:17 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-07-19 16:33:02 +0200
commit0fe8acf2d69bf4bce620128e48b62a957421a106 (patch)
tree9a1c4faf95dbd0f6932a590d2075a9e73bb90a00 /ffmpeg.c
parent52ab418588ba14a53b40a80ea32589f8844f3ce6 (diff)
downloadffmpeg-streaming-0fe8acf2d69bf4bce620128e48b62a957421a106.zip
ffmpeg-streaming-0fe8acf2d69bf4bce620128e48b62a957421a106.tar.gz
ffmpeg: add -(no)stdin option.
Allows to disable interaction from standard input. Useful, for example, if ffmpeg is in the background process group. Roughly the same result can be achieved with "ffmpeg ... < /dev/null" but it requires a shell.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 9057fe1..2d12241 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -5878,6 +5878,8 @@ static const OptionDef options[] = {
"add timings for each task" },
{ "progress", HAS_ARG | OPT_EXPERT, {(void*)opt_progress},
"write program-readable progress information", "url" },
+ { "stdin", OPT_BOOL | OPT_EXPERT, {(void*)&stdin_interaction},
+ "enable or disable interaction on standard input" },
{ "timelimit", HAS_ARG, {(void*)opt_timelimit}, "set max runtime in seconds", "limit" },
{ "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump},
"dump each input packet" },
OpenPOWER on IntegriCloud