diff options
author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-07-11 14:07:55 +0000 |
---|---|---|
committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-07-11 14:07:55 +0000 |
commit | 4b54c6d08437e5e3dd9359f29b247be58fef965f (patch) | |
tree | 1b2f9b0c4a8bf6ebc80e1cb30ad741747de0b0bc | |
parent | e16e49ac90f6da9e019fdf23084cbb256d14bd9c (diff) | |
download | ffmpeg-streaming-4b54c6d08437e5e3dd9359f29b247be58fef965f.zip ffmpeg-streaming-4b54c6d08437e5e3dd9359f29b247be58fef965f.tar.gz |
Check for termios before conio
Originally committed as revision 9598 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | ffmpeg.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -34,15 +34,15 @@ #include "fifo.h" #include "avstring.h" -#if defined(HAVE_CONIO_H) -#include <conio.h> -#elif defined(HAVE_TERMIOS_H) +#if defined(HAVE_TERMIOS_H) #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> #include <sys/time.h> #include <termios.h> #include <sys/resource.h> +#elif defined(HAVE_CONIO_H) +#include <conio.h> #endif #undef time //needed because HAVE_AV_CONFIG_H is defined on top #include <time.h> @@ -334,10 +334,7 @@ static void term_init(void) /* read a key without blocking */ static int read_key(void) { -#if defined(HAVE_CONIO_H) - if(kbhit()) - return(getch()); -#elif defined(HAVE_TERMIOS_H) +#if defined(HAVE_TERMIOS_H) int n = 1; unsigned char ch; #ifndef CONFIG_BEOS_NETSERVER @@ -357,6 +354,9 @@ static int read_key(void) return n; } +#elif defined(HAVE_CONIO_H) + if(kbhit()) + return(getch()); #endif return -1; } |