RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: do not call exit from exit_program() 

This should fix  Ticket2116

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-06 04:03:52 +01:00
parent 68dfe530e0
commit 127ff88639
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg.c
View File

@ -481,7 +481,6 @@ static void exit_program(void)
if (received_sigterm) { if (received_sigterm) {
av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n", av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
(int) received_sigterm); (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); printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
} }
exit(0); exit(received_nb_signals ? 255 : 0);
return 0; return 0;
} }