From patchwork Sun Oct 22 11:08:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 44310 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp829002pzb; Sun, 22 Oct 2023 04:08:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHzPZtdI2jRQ1NpcN27N23JjzRUT4szu6egGtx0NJkJOFEVa0UwUN6TG94bIvsy7INQ7Ad8 X-Received: by 2002:a50:aad8:0:b0:53f:9ced:e5c2 with SMTP id r24-20020a50aad8000000b0053f9cede5c2mr3961550edc.12.1697972938867; Sun, 22 Oct 2023 04:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697972938; cv=none; d=google.com; s=arc-20160816; b=yDE1RtBGIi37AYuj50CvB9cXGotp/ki2m5+nzaQ4aaR6ty2dbCRgKshfbkTz2RrPCK xK8A+9cz/VmdbeDVpdQZGaH5sw0vensCZlhgrPt6UTSu/Mw3Drwbbp14vvnS9ye4ukQL i5z1WcRiBXHUslJsv4GwQq5/PWUVkoFs9y8ZyADjaPji7u9dc1TU5Xm8vfjKQZQr9uJ9 W9ehLfBCNxcKAfERIQ4CAj8cUOx0llJAiFnDp1IImJ/c1OFexhzhH28saCqsOVnAPIaM SNV67clW1iMAFofQ5tz6aPbR5IUzUrO8HguAO+0ufNedXztue7+tKNBDRanP+QskScmN 8gtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=ppYAM7n0/Gr1du4trd/kiSRHgxMfe0g3Jd0LVhEz5mc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HU65CUkgKxOsRVlxxTYy6n8HFB2muRnPqvHVlkqbRjCISZVAzWmcjT78nbFVtawPQj nCGfAS7BvWg1uyGac62uErLPEYidbQos+DmgHpKDq4bhtyBLI9EPZPfCzKhnjaY1sARP II+wunYGnmsG6wmZNceaEWDQ84uEAowm2e7pG/go5ghD4kE4d0FUoxKak6wsHYO7NqF8 XA7hlrRFuGEljhIYCMtcmKKTa5EOzT9lx46Q+QokAtxf1p0BqOfjCGX4yd3LzhJ025Fg UC2e00V2xNoBbzSNAge/NMS47OCRloAs8NlIfK/NHKXBrycrISIarXZOcDIS0tG19ldo tp/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=xcJKJDn1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b11-20020a056402084b00b0053de95eda10si2417335edz.667.2023.10.22.04.08.57; Sun, 22 Oct 2023 04:08:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=xcJKJDn1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F58F68CA44; Sun, 22 Oct 2023 14:08:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6054568C620 for ; Sun, 22 Oct 2023 14:08:47 +0300 (EEST) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-507a55302e0so3043929e87.0 for ; Sun, 22 Oct 2023 04:08:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1697972926; x=1698577726; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=O9vzI1vzq3ZTb16eDKWoW1eK38t59QpsWHXhHvYW9zE=; b=xcJKJDn1RMJm76hObv0F2arXosKVi52vNRY7dROj0y4ruAWoczGtL57Wt3f+0hl7fk GE00ct4sjFfb7TQD4JZAjbgmqJVcZVddzDLmvmBLP7XGmdZvY+HZU9qKOxA9ZYiJoFVS 7fZTP51XuSYPQawRyDVWbvcFEVo8wJ9HqCkinW+2GLUyjBoLvPvbRFoWr46A4SsX8zQ/ xBvsNHuPxxpdI2w4+lxrdFUgCgc9Zd4kLB1GprqxtzvABnRGgJWQoHO2GPxcJ9gwS7p/ sxyQdBkv4Ws9+dYrOZfKRsP0jsbxA+92vIX19ghmOa733oSAIacaTmfEVWxKqThkjUMw 36Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697972926; x=1698577726; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O9vzI1vzq3ZTb16eDKWoW1eK38t59QpsWHXhHvYW9zE=; b=oIETTda4ckHkjEaJeEjoaqgcR2GXIFExejgQenGlTtSsHBXqF6pSpoS7h6sBA6vAQq pCJ9FRn4gYRolpcUvTmlg3LPtPIngE9N7qvrwzeLbvXm40qKv40cLZnNcACRPH9IF2+z T4+/uXb5OWL0Muop5w96lebW+BFRxe78ObSCLbqR+t05Yq0y4lNr09z5idG5uWtR5yy6 bES6eFUn7K0LvWrxAYkDRKQJF4XgEBs99sHe8h7AXV5so8CRBWFI0zirBsvLpGzwL7lW LpckeZqjmoH+bo2fB60TD+olBHMyPy33WqicshqHL0bsciFKOcO6kUfSgmQD4S1bGg8G IHZw== X-Gm-Message-State: AOJu0Yx8b6+K+EeuimipjMAsEhpAPW7Q+awkigKJmWD9IoPnwbBuL1LG MgphBPjWCCH2WzSYRxEtL8QnKFylTNBq95s6gG3gbg== X-Received: by 2002:a19:650d:0:b0:507:9dfd:f846 with SMTP id z13-20020a19650d000000b005079dfdf846mr4389758lfb.69.1697972925664; Sun, 22 Oct 2023 04:08:45 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id b30-20020a056512025e00b004ff9ecbf158sm1202404lfo.74.2023.10.22.04.08.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 04:08:45 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Oct 2023 14:08:44 +0300 Message-Id: <20231022110844.453767-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools: Check HAVE_GETSTDHANDLE before using GetStdHandle X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SNY2DwMw0dlk 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;