diff options
| author | Dave Yeo <dave.r.yeo@gmail.com> | 2011-03-22 03:47:48 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-03-22 11:07:46 +0000 |
| commit | b58b9fa3b5243f02e5212db9171b2f02de4524ea (patch) | |
| tree | ebdc8cfb44c44998b6b7c503b4353d9d79195453 | |
| parent | 2a569799a90986cf137792cc03a56752447652c7 (diff) | |
| download | ffmpeg-b58b9fa3b5243f02e5212db9171b2f02de4524ea.tar.gz | |
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>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | ffmpeg.c | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -1037,7 +1037,6 @@ HAVE_LIST=" bswap closesocket cmov - conio_h dcbzl dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@ -1067,6 +1066,7 @@ HAVE_LIST=" inet_aton inline_asm isatty + kbhit ldbrx libdc1394_1 libdc1394_2 @@ -2775,6 +2775,7 @@ check_func ${malloc_prefix}posix_memalign && enable posix_memalign check_func setrlimit check_func strerror_r check_func strtok_r +check_func_headers conio.h kbhit check_func_headers io.h setmode check_func_headers lzo/lzo1x.h lzo1x_999_compress check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi @@ -2782,7 +2783,6 @@ check_func_headers windows.h GetProcessTimes check_func_headers windows.h MapViewOfFile check_func_headers windows.h VirtualAlloc -check_header conio.h check_header dlfcn.h check_header dxva2api.h check_header malloc.h @@ -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"); |