]> git.sesse.net Git - ffmpeg/blobdiff - ffmpeg.c
udp: try to clarify verbiage on buffer_size
[ffmpeg] / ffmpeg.c
index de9af449544d176d428ddfc455fc7b504c42bb0a..4b9209dd9268138d39c8b38ae5fde7aeb99d891a 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -303,15 +303,20 @@ static void sub2video_flush(InputStream *ist)
 
 /* end of sub2video hack */
 
-void term_exit(void)
+static void term_exit_sigsafe(void)
 {
-    av_log(NULL, AV_LOG_QUIET, "%s", "");
 #if HAVE_TERMIOS_H
     if(restore_tty)
         tcsetattr (0, TCSANOW, &oldtty);
 #endif
 }
 
+void term_exit(void)
+{
+    av_log(NULL, AV_LOG_QUIET, "%s", "");
+    term_exit_sigsafe();
+}
+
 static volatile int received_sigterm = 0;
 static volatile int received_nb_signals = 0;
 static int main_return_code = 0;
@@ -321,9 +326,9 @@ sigterm_handler(int sig)
 {
     received_sigterm = sig;
     received_nb_signals++;
-    term_exit();
+    term_exit_sigsafe();
     if(received_nb_signals > 3)
-        exit_program(123);
+        exit(123);
 }
 
 void term_init(void)
@@ -1280,7 +1285,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
             vid = 1;
         }
         /* compute min output value */
-        if ((is_last_report || !ost->finished) && ost->st->pts.val != AV_NOPTS_VALUE)
+        if (ost->st->pts.val != AV_NOPTS_VALUE)
             pts = FFMAX(pts, av_rescale_q(ost->st->pts.val,
                                           ost->st->time_base, AV_TIME_BASE_Q));
     }