[FFmpeg-cvslog] ffmpeg: avoid a confusing and easy to break if().
Reimar Döffinger
git at videolan.org
Wed Jun 6 17:17:21 CEST 2012
ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Wed Jun 6 12:39:07 2012 +0200| [93147daf59b096f3d6ad6d9e8d8c11c293e425d2] | committer: Michael Niedermayer
ffmpeg: avoid a confusing and easy to break if().
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93147daf59b096f3d6ad6d9e8d8c11c293e425d2
---
ffmpeg.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 914bc6a..3d6853f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1217,10 +1217,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);
More information about the ffmpeg-cvslog
mailing list