[FFmpeg-cvslog] Revert "ffmpeg: modify tty state when stderr is redirected"

Michael Niedermayer git at videolan.org
Thu Jul 30 23:57:06 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 30 22:58:35 2015 +0200| [d2077c860e56a5c0239fc5d1699e31ae127b2706] | committer: Michael Niedermayer

Revert "ffmpeg: modify tty state when stderr is redirected"

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2077c860e56a5c0239fc5d1699e31ae127b2706
---

 ffmpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index eb3f613..5575e2f 100644
--- 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;



More information about the ffmpeg-cvslog mailing list