[SCM] libav/experimental: Register atexit handler only when needed

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9a9509e6eeac6c0b8b7ca7a60ccb712ed4960566
Author: Måns Rullgård <mans at mansr.com>
Date:   Fri Mar 19 16:25:11 2010 +0000

    Register atexit handler only when needed
    
    Originally committed as revision 22599 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 5a22dde..5e35022 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -318,14 +318,12 @@ typedef struct AVInputFile {
 
 /* init terminal so that we can grab keys */
 static struct termios oldtty;
-#endif
 
 static void term_exit(void)
 {
-#if HAVE_TERMIOS_H
     tcsetattr (0, TCSANOW, &oldtty);
-#endif
 }
+#endif
 
 static volatile int received_sigterm = 0;
 
@@ -343,6 +341,7 @@ static void term_init(void)
 
     tcgetattr (0, &tty);
     oldtty = tty;
+    atexit(term_exit);
 
     tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
                           |INLCR|IGNCR|ICRNL|IXON);
@@ -363,10 +362,6 @@ static void term_init(void)
     signal(SIGXCPU, sigterm_handler);
 #endif
 
-    /*
-    register a function to be called at normal program termination
-    */
-    atexit(term_exit);
 #if CONFIG_BEOS_NETSERVER
     fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
 #endif

-- 
Libav/FFmpeg packaging