diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-06-06 12:39:07 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 00:55:26 +0200 |
commit | 565581b0a4e89e2633bef868d9db52bd999122d0 (patch) | |
tree | 42b40c961c6562640feff3af38b9b6d340b24508 | |
parent | dc85ca0945c902695815fe9a32aeb383236a19b6 (diff) | |
download | ffmpeg-565581b0a4e89e2633bef868d9db52bd999122d0.tar.gz |
ffmpeg: avoid a confusing and easy to break if().
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 93147daf59b096f3d6ad6d9e8d8c11c293e425d2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffmpeg.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1456,10 +1456,11 @@ static void term_init(void) #if HAVE_TERMIOS_H if(!run_as_daemon){ struct termios tty; + int istty = 1; #if HAVE_ISATTY - if(isatty(0) && isatty(2)) + istty = isatty(0) && isatty(2); #endif - if (tcgetattr (0, &tty) == 0) { + if (istty && tcgetattr (0, &tty) == 0) { oldtty = tty; restore_tty = 1; atexit(term_exit); |