[FFmpeg-devel] [PATCH] fftools: Check HAVE_GETSTDHANDLE before using GetStdHandle

[FFmpeg-devel] [PATCH] fftools: Check HAVE_GETSTDHANDLE before using GetStdHandle

[Martin Storsjö]

GetStdHandle is unavailable outside of the desktop API subset.

This didn't use to be a problem with earlier WinSDKs, as kbhit also
used to be available only for desktop apps, and this whole section is
wrapped in #if HAVE_KBHIT. With newer WinSDKs, kbhit() is available also
for non-desktop apps, while GetStdHandle still isn't.
---
 fftools/ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 7c33b56cd3..46a85b41a8 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -308,7 +308,7 @@ static int read_key(void)
         return n;
     }
 #elif HAVE_KBHIT
-#    if HAVE_PEEKNAMEDPIPE
+#    if HAVE_PEEKNAMEDPIPE && HAVE_GETSTDHANDLE
     static int is_pipe;
     static HANDLE input_handle;
     DWORD dw, nchars;
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] fftools: Check HAVE_GETSTDHANDLE before using GetStdHandle

[Anton Khirnov]

Quoting Martin Storsjö (2023-10-22 13:08:44)
> GetStdHandle is unavailable outside of the desktop API subset.
> 
> This didn't use to be a problem with earlier WinSDKs, as kbhit also
> used to be available only for desktop apps, and this whole section is
> wrapped in #if HAVE_KBHIT. With newer WinSDKs, kbhit() is available also
> for non-desktop apps, while GetStdHandle still isn't.
> ---
>  fftools/ffmpeg.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

LGTM

-- 
Anton Khirnov
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".