Merge remote-tracking branch 'qatar/master'

[ffmpeg] / ffmpeg.c

diff --git a/ffmpeg.c b/ffmpeg.c
index 25001f57db69232cb34ef906789e44ed094cb0c6..051e279763e2ca351ec3e1d8fa9042ec0019f2c0 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -316,6 +316,7 @@ void term_exit(void)
 
 static volatile int received_sigterm = 0;
 static volatile int received_nb_signals = 0;
+static volatile int transcode_init_done = 0;
 static int main_return_code = 0;
 
 static void
@@ -422,7 +423,7 @@ static int read_key(void)
 
 static int decode_interrupt_cb(void *ctx)
 {
-    return received_nb_signals > 1;
+    return received_nb_signals > transcode_init_done;
 }
 
 const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
@@ -895,7 +896,7 @@ static void do_video_out(AVFormatContext *s,
     nb_frames = FFMIN(nb_frames, ost->max_frames - ost->frame_number);
     if (nb_frames == 0) {
         nb_frames_drop++;
-        av_log(NULL, AV_LOG_WARNING,
+        av_log(NULL, AV_LOG_VERBOSE,
                "*** dropping frame %d from stream %d at ts %"PRId64"\n",
                ost->frame_number, ost->st->index, in_picture->pts);
         return;
@@ -2889,6 +2890,8 @@ static int transcode_init(void)
         print_sdp();
     }
 
+    transcode_init_done = 1;
+
     return 0;
 }