diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 04:03:52 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 04:15:48 +0100 |
commit | b48cf5412bb4a57cc6fecd0aa8760356f9db7368 (patch) | |
tree | f9fa019bceadfd70dd5137caf7bc54a93aff52e0 | |
parent | 5f3fa5f930875e22664fbd403b107b3a37fb4d77 (diff) | |
download | ffmpeg-b48cf5412bb4a57cc6fecd0aa8760356f9db7368.tar.gz |
ffmpeg: do not call exit from exit_program()n1.1.2
This should fix Ticket2116
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 127ff88639e78b9d16fecb973c41b86a843b4fa7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -471,7 +471,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); } } @@ -3220,6 +3219,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; } |