summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ffmpeg.c4
-rw-r--r--ffmpeg_opt.c3
2 files changed, 4 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)
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index d202f43..bea2829 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -3160,6 +3160,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) {
OpenPOWER on IntegriCloud