From 127ff88639e78b9d16fecb973c41b86a843b4fa7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 6 Feb 2013 04:03:52 +0100 Subject: [PATCH] ffmpeg: do not call exit from exit_program() This should fix Ticket2116 Signed-off-by: Michael Niedermayer --- ffmpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index bbd21b6d4b..bda7610800 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -481,7 +481,6 @@ static void exit_program(void) if (received_sigterm) { av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n", (int) received_sigterm); - exit (255); } } @@ -3316,6 +3315,6 @@ int main(int argc, char **argv) printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss); } - exit(0); + exit(received_nb_signals ? 255 : 0); return 0; }