diff mbox

[FFmpeg-devel,1/2] ffmpeg: don't reconfigure terminal if we're not taking input from stdin

Message ID 20160910205445.63805-1-rodger.combs@gmail.com
State Accepted
Commit 1f7d5860525ad9b7540502ce01b2f239eada8e87
Headers show

Commit Message

Rodger Combs Sept. 10, 2016, 8:54 p.m. UTC 
---
 ffmpeg.c     | 4 +---
 ffmpeg_opt.c | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/ffmpeg.c b/ffmpeg.c
index d858407..111d844 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;
@@ -4328,8 +4328,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)
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 2ea09cf..4d3d4c4 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -3102,6 +3102,9 @@  int ffmpeg_parse_options(int argc, char **argv)
         goto fail;
     }
 
+    /* configure terminal and setup signal handlers */
+    term_init();
+
     /* open input files */
     ret = open_files(&octx.groups[GROUP_INFILE], "input", open_input_file);
     if (ret < 0) {