mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-16 03:50:05 +01:00
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:
6
ffmpeg.c
6
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");
|
||||
|
||||
Reference in New Issue
Block a user