X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=13405e309e85fa47f91e55d49d4b29603fd6e2fb;hb=79f2014f1264aeb9dae3134d3649aba6ca0d4d13;hp=e31a2c6092054e22bf08654b732e35231c55a521;hpb=24fea89983756fcd9bfee475581a7b049b3ad8ee;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index e31a2c60920..13405e309e8 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -32,14 +32,12 @@ #include #include -#if HAVE_ISATTY #if HAVE_IO_H #include #endif #if HAVE_UNISTD_H #include #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; @@ -1529,7 +1523,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti AVCodecContext *enc; int frame_number, vid, i; double bitrate; - int64_t pts = INT64_MIN; + int64_t pts = INT64_MIN + 1; static int64_t last_time = -1; static int qp_histogram[52]; int hours, mins, secs, us;