ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanaga...@gmail.com> | Fri Jul 31 08:36:27 2015 -0400| [3ae98497c2fc6409828cdd1f2fad9ab244505581] | committer: Ronald S. Bultje
ffmpeg: modify tty state when stderr is redirected Removes unnecessary isatty(), fixes Ticket2964 Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com> Signed-off-by: Ronald S. Bultje <rsbul...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ae98497c2fc6409828cdd1f2fad9ab244505581 --- ffmpeg.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 85cc6e4..13405e3 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -32,14 +32,12 @@ #include <limits.h> #include <stdint.h> -#if HAVE_ISATTY #if HAVE_IO_H #include <io.h> #endif #if HAVE_UNISTD_H #include <unistd.h> #endif -#endif #include "libavformat/avformat.h" #include "libavdevice/avdevice.h" @@ -370,11 +368,7 @@ void term_init(void) #if HAVE_TERMIOS_H if(!run_as_daemon){ struct termios tty; - int istty = 1; -#if HAVE_ISATTY - istty = isatty(0) && isatty(2); -#endif - if (istty && tcgetattr (0, &tty) == 0) { + if (tcgetattr (0, &tty) == 0) { oldtty = tty; restore_tty = 1; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
