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

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>
This commit is contained in:
Dave Yeo 2011-03-22 03:47:48 +00:00 committed by Mans Rullgard
parent 2a569799a9
commit b58b9fa3b5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1037,7 +1037,6 @@ HAVE_LIST="
bswap bswap
closesocket closesocket
cmov cmov
conio_h
dcbzl dcbzl
dev_bktr_ioctl_bt848_h dev_bktr_ioctl_bt848_h
dev_bktr_ioctl_meteor_h dev_bktr_ioctl_meteor_h
@ -1067,6 +1066,7 @@ HAVE_LIST="
inet_aton inet_aton
inline_asm inline_asm
isatty isatty
kbhit
ldbrx ldbrx
libdc1394_1 libdc1394_1
libdc1394_2 libdc1394_2
@ -2775,6 +2775,7 @@ check_func ${malloc_prefix}posix_memalign && enable posix_memalign
check_func setrlimit check_func setrlimit
check_func strerror_r check_func strerror_r
check_func strtok_r check_func strtok_r
check_func_headers conio.h kbhit
check_func_headers io.h setmode check_func_headers io.h setmode
check_func_headers lzo/lzo1x.h lzo1x_999_compress check_func_headers lzo/lzo1x.h lzo1x_999_compress
check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi 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 MapViewOfFile
check_func_headers windows.h VirtualAlloc check_func_headers windows.h VirtualAlloc
check_header conio.h
check_header dlfcn.h check_header dlfcn.h
check_header dxva2api.h check_header dxva2api.h
check_header malloc.h check_header malloc.h

6
ffmpeg.c
View File

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