Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-30 23:58:35 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-31 00:49:54 +0300
commitd2077c860e56a5c0239fc5d1699e31ae127b2706 (patch)
tree62326d57f00e72b832ef83e73be00418053ec845 /ffmpeg.c
parent802e51299e6d018f2f54c8d14f2b765c7c750496 (diff)
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.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index eb3f613400..5575e2f9a4 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;