Revert "ffmpeg: modify tty state when stderr is redirected"
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 20:58:35 +0000 (22:58 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 21:49:54 +0000 (23:49 +0200)
faults in fate otherwise breaks the terminal.
To reproduce, add a abort() into wav_read_header()
run make fate-acodec-adpcm-ima_wav

This reverts commit 92e62f49cf7440a9e8998d284528e223c0948c97.

ffmpeg.c

index eb3f613..5575e2f 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -372,7 +372,7 @@ void term_init(void)
         struct termios tty;
         int istty = 1;
 #if HAVE_ISATTY
-        istty = isatty(0);
+        istty = isatty(0) && isatty(2);
 #endif
         if (istty && tcgetattr (0, &tty) == 0) {
             oldtty = tty;