From 0fe8acf2d69bf4bce620128e48b62a957421a106 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Wed, 11 Jul 2012 21:10:17 +0200
Subject: [PATCH] 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.
---
 Changelog       | 1 +
 doc/ffmpeg.texi | 8 ++++++++
 ffmpeg.c        | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/Changelog b/Changelog
index 7372d0d48c..4242cea3da 100644
--- a/Changelog
+++ b/Changelog
@@ -31,6 +31,7 @@ version next:
 - new option: -progress
 - 3GPP Timed Text decoder
 - GeoTIFF decoder support
+- ffmpeg -(no)stdin option
 
 
 version 0.11:
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index c9b6514fed..904a50589a 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -361,6 +361,14 @@ the encoding process. It is made of "@var{key}=@var{value}" lines. @var{key}
 consists of only alphanumeric characters. The last key of a sequence of
 progress information is always "progress".
 
+@item -stdin
+Enable interaction on standard input. On by default unless standard input is
+used as an input.
+
+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
 mostly useful for testing and debugging purposes, and the output
diff --git a/ffmpeg.c b/ffmpeg.c
index 9057fe178a..2d12241a0a 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" },