[FFmpeg-cvslog] ffmpeg: do not call exit from exit_program()

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 04:03:52 2013 +0100| [b48cf5412bb4a57cc6fecd0aa8760356f9db7368] | committer: Michael Niedermayer

ffmpeg: do not call exit from exit_program()

This should fix  Ticket2116

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 127ff88639e78b9d16fecb973c41b86a843b4fa7)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b48cf5412bb4a57cc6fecd0aa8760356f9db7368
---

 ffmpeg.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 75debe9..e9837bf 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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;
 }