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

Register atexit handler only when needed 

Originally committed as revision 22599 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-03-19 16:25:11 +00:00
parent f5af8f1625
commit 9a9509e6ee
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffmpeg.c
View File

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