diff --git a/ffmpeg.c b/ffmpeg.c index 766c6068b0206190fe8b3135bd65a2db6915659e..d5cc28a25c90caecb338e76c9485180a52a0d0f0 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -34,15 +34,15 @@ #include "fifo.h" #include "avstring.h" -#if defined(HAVE_CONIO_H) -#include -#elif defined(HAVE_TERMIOS_H) +#if defined(HAVE_TERMIOS_H) #include #include #include #include #include #include +#elif defined(HAVE_CONIO_H) +#include #endif #undef time //needed because HAVE_AV_CONFIG_H is defined on top #include @@ -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; }