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:03:52 +0100 |
commit | 127ff88639e78b9d16fecb973c41b86a843b4fa7 (patch) | |
tree | 052f15e62e95d0683ca69c7320c38a6e9ede1477 /ffmpeg.c | |
parent | 68dfe530e0fb03b4d21dfe37f8a572b95c68485e (diff) | |
download | ffmpeg-127ff88639e78b9d16fecb973c41b86a843b4fa7.tar.gz |
ffmpeg: do not call exit from exit_program()
This should fix Ticket2116
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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; } |