generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: avoid a confusing and easy to break if().

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 93147daf59b096f3d6ad6d9e8d8c11c293e425d2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Reimar Döffinger 2012-06-06 12:39:07 +02:00 committed by Michael Niedermayer
parent dc85ca0945
commit 565581b0a4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

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