ffmpeg: Don't trigger url_interrupt_cb on the first signal
authorMartin Storsjö <martin@martin.st>
Sun, 22 May 2011 11:40:33 +0000 (14:40 +0300)
committerMartin Storsjö <martin@martin.st>
Sun, 22 May 2011 19:06:20 +0000 (22:06 +0300)
Currently, the url_interrupt_cb callback will abort all IO
after the first received signal. This makes the output files
from e.g. the mov muxer to be unreadable if the transcode is
aborted with ctrl+c.

After this patch, the first signal cleanly breaks out of
the transcoding loop, but won't forcibly abort all IO.
After the second signal is received, the url_interrupt_cb
callback will abort all IO.

Signed-off-by: Martin Storsjö <martin@martin.st>
ffmpeg.c

index 0c95451..8673253 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -426,11 +426,13 @@ static void term_exit(void)
 }
 
 static volatile int received_sigterm = 0;
+static volatile int received_nb_signals = 0;
 
 static void
 sigterm_handler(int sig)
 {
     received_sigterm = sig;
+    received_nb_signals++;
     term_exit();
 }
 
@@ -445,7 +447,7 @@ static void term_init(void)
 
 static int decode_interrupt_cb(void)
 {
-    return received_sigterm;
+    return received_nb_signals > 1;
 }
 
 static int ffmpeg_exit(int ret)