From patchwork Tue May 23 11:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 41793 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp491363pzb; Tue, 23 May 2023 04:23:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5PBYLRqiJ294/gUqwBj6ruNBadn739eRpdEnLB2v3pYeqXMy4wvaz6h/a3M+oxhA6mz/Bs X-Received: by 2002:a05:6402:40d3:b0:508:3c23:ae95 with SMTP id z19-20020a05640240d300b005083c23ae95mr18904591edb.3.1684841034087; Tue, 23 May 2023 04:23:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684841034; cv=none; d=google.com; s=arc-20160816; b=mL/GiwMo7iucN95sXaQi4tdfmGOEk/Urm8BKQL5LHrORA+UVTjiAqpPtbDPHqaOG2V IZv7A5DUlF8SAfn4jvU7gD16dR8gk9w595flZ4ngC9gOJjkhXDDwdHTYoxQiVaH/Xp6H blEqmW83m3OiKv+45tJHnwVIDRxklP+ujnMu1tNkRrjFj1BoZo/KPors0MGit2VMw9qB SoqTs45X6+itmD3HJyeErwEp01lEFRB9AhECuR3ZQBMUSagEMp+q6vgnazcZX+7FGBU+ o9vO9j1dMCa70ZlfMsOJy6bhgq6KF5XmQ2DIrHh/WrHUWPiES0bM4LzTLUo9rRWkknOy ts4w== 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 :delivered-to; bh=h3/86CvufQkOH9kJsxS2drn55RFq8qe3iCRdh8LsDa0=; b=eb452TlVyYKSbsyU/MISRNXDG3YY2nkVs6yxbN+barJ4toSR4RquTyaLgwgl6pBub4 ozTwAgQ2lQAJKS66dQg7+JlAWJlfTM/V3uGdfqpKrnxFYB00QB6f3SNjX6FNbPiEor0y giHSjD4H+eo92+kXHLwg1akv8sMUqi31yhYaFq5WP5/7kQHgfV64auU9HT5jORnsOEC/ 7JRzKusktIwP1tMrGsF4WD6xMP42vXVNMiJld714mv3jfbJN2FMC6/nZHocAGF9s0dg9 yEHGYvKJ/KbYqDTDcFGO6EdV8Sf058nUs5nEMkQu2qWo8L9YM256wrsKBiMMY/6G2WYh ne2A== ARC-Authentication-Results: i=1; mx.google.com; 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 dy14-20020a05640231ee00b005067c959debsi1516458edb.603.2023.05.23.04.23.53; Tue, 23 May 2023 04:23:54 -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; 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 EF09168BFAF; Tue, 23 May 2023 14:23:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BD6F68B7D1 for ; Tue, 23 May 2023 14:23:43 +0300 (EEST) Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4QQX4n01rBz9sqX for ; Tue, 23 May 2023 13:23:37 +0200 (CEST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 May 2023 13:23:24 +0200 Message-Id: <20230523112324.3084-1-robux4@ycbcr.xyz> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4QQX4n01rBz9sqX Subject: [FFmpeg-devel] [PATCH] w32pthread: fix signature of WinRT version of thread worker 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: 1uCPcpMIyUwR The callback passed to CreateThread is not the same as with _beginthreadex(). This WinRT check could be removed if Win8 WinRT is not maintained as _beginthreadex() is now available [1] [1] https://learn.microsoft.com/en-us/cpp/cppcx/crt-functions-not-supported-in-universal-windows-platform-apps?view=msvc-160#windows-8x-store-apps-and-windows-phone-8x-apps --- compat/w32pthreads.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 6405e72b64..364eebfe4e 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -66,7 +66,11 @@ typedef CONDITION_VARIABLE pthread_cond_t; #define PTHREAD_CANCEL_ENABLE 1 #define PTHREAD_CANCEL_DISABLE 0 +#if HAVE_WINRT +static av_unused DWORD WINAPI attribute_align_arg win32thread_worker(void *arg) +#else static av_unused unsigned __stdcall attribute_align_arg win32thread_worker(void *arg) +#endif { pthread_t *h = (pthread_t*)arg; h->ret = h->func(h->arg);