ffmpeg: don't reconfigure terminal if we're not taking input from stdin

This commit is contained in:
Rodger Combs 2016-09-07 19:16:27 -05:00
parent 711bfb33df
commit 1f7d586052
No known key found for this signature in database
GPG Key ID: E3E54DCDCD3CB843
2 changed files with 4 additions and 3 deletions

View File

@ -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)

View File

@ -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) {