summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2016-09-07 19:16:27 -0500
committerRodger Combs <rodger.combs@gmail.com>2016-10-06 18:31:06 -0500
commit1f7d5860525ad9b7540502ce01b2f239eada8e87 (patch)
tree24e37f9801eadbd5f540927107ab80a53f7c826f /ffmpeg.c
parent711bfb33df4efa252a85d2d6987c435d0eef1a48 (diff)
downloadffmpeg-streaming-1f7d5860525ad9b7540502ce01b2f239eada8e87.zip
ffmpeg-streaming-1f7d5860525ad9b7540502ce01b2f239eada8e87.tar.gz
ffmpeg: don't reconfigure terminal if we're not taking input from stdin
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index ee5a768..44371f0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -366,7 +366,7 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
void term_init(void)
{
#if HAVE_TERMIOS_H
- if(!run_as_daemon){
+ if (!run_as_daemon && stdin_interaction) {
struct termios tty;
if (tcgetattr (0, &tty) == 0) {
oldtty = tty;
@@ -4493,8 +4493,6 @@ int main(int argc, char **argv)
show_banner(argc, argv, options);
- term_init();
-
/* parse options and open all input/output files */
ret = ffmpeg_parse_options(argc, argv);
if (ret < 0)
OpenPOWER on IntegriCloud