From b58b9fa3b5243f02e5212db9171b2f02de4524ea Mon Sep 17 00:00:00 2001
From: Dave Yeo <dave.r.yeo@gmail.com>
Date: Tue, 22 Mar 2011 03:47:48 +0000
Subject: Make sure kbhit() is in conio.h

Conio.h is a non-standard header and may not have kbhit()
prototyped. This fixes compile on OS/2 where the EMX version (we're
using a fork) of conio.h only has getch() and getche().

Signed-off-by: Mans Rullgard <mans@mansr.com>
---
 ffmpeg.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ffmpeg.c')

diff --git a/ffmpeg.c b/ffmpeg.c
index 645fdb6db8..6922e62244 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -69,7 +69,7 @@
 #include <sys/select.h>
 #endif
 
-#if HAVE_CONIO_H
+#if HAVE_KBHIT
 #include <conio.h>
 #endif
 #include <time.h>
@@ -435,7 +435,7 @@ static void term_init(void)
 /* read a key without blocking */
 static int read_key(void)
 {
-#if HAVE_CONIO_H
+#if HAVE_KBHIT
     if(kbhit())
         return(getch());
 #endif
@@ -2437,7 +2437,7 @@ static int transcode(AVFormatContext **output_files,
     }
 
     if (!using_stdin && verbose >= 0) {
-#if HAVE_CONIO_H
+#if HAVE_KBHIT
         fprintf(stderr, "Press [q] to stop encoding\n");
 #else
         fprintf(stderr, "Press ctrl-c to stop encoding\n");
-- 
cgit v1.2.3