From patchwork Tue Aug 17 15:35:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Degawa X-Patchwork-Id: 29589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3088821iov; Tue, 17 Aug 2021 08:35:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy205mDqDKgSorLxEZw69gDEu2GwZ4sKmFOlIHRtzgAEktWJuBNUgd9A85jE3jeEGT6+gpy X-Received: by 2002:a50:cdcb:: with SMTP id h11mr4899621edj.366.1629214553910; Tue, 17 Aug 2021 08:35:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629214553; cv=none; d=google.com; s=arc-20160816; b=OLXrtWWEOq7Recog7riEX6axKm2oU5hisz6We6Qdv8HnUXi7+9GRb2cFPVHYmL/ufP c3jBDCIEh3GLFFsAfmrT0z171MN2yWpbPw4rFcPXODJvgJ8BbwrkafGYOYromSvhZAsi H0FNGe+bUJkPOf95QmUL0MM1OszuB6d3MVWfqvLowrWyI8djn1ca0b/+PH5PVxrP1h+t 6vuyGH+uMyZd6slV9dEUuIBCHZJ5+v4+/LcDs4mmfWh5FBYtg+2ydTeOQ+ehViRXSTfZ l6TzwyaTrfwWuIElfk8P2P0D1OKK1Y9VHARJTVDW2Rvb7GRx/6UKR7RiI9LCLkfVketK imsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=g3XecCODCKEC50Ib4TKLBxuRhFc9tOZS8lnVhrbXNPk=; b=Gl5Hyls4Y/V7aBuTqEJBF1qetISVfrFhDo8D2z1kChBjP9ANi17L16WdGhjExdN1nW VCZsSz4d2+Pquv36Ony+o36xsrXk+FOAPySrOTLQ56RCmecB2pOBoHDAl8mn9t4N/PSW 8pzvmwfik9PhXVrtR88yzWzCA08PHf7SX+TwiCKy2tnN2/AdQjRl8zIBBOQw8lBMwGAQ jG81BayzmN86xaiZ9aa8bJ8DOlveavi+uj3zFozT/N1rSlE9oto5BeewSUYMNR38hYXY A53yXZHUkwZneKeVFVm7j/7zXoEeOynF980Eap6gK7YjiQGce4fCzYvptBGdzKM44yyS R9yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@randomderp.com header.s=default header.b=NCG4KTJL; 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 cx14si2940254edb.407.2021.08.17.08.35.53; Tue, 17 Aug 2021 08:35:53 -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=@randomderp.com header.s=default header.b=NCG4KTJL; 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 709A768A59F; Tue, 17 Aug 2021 18:35:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from degawa.com (unknown [174.127.109.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 154A668991B for ; Tue, 17 Aug 2021 18:35:44 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomderp.com; s=default; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zmJSDinLvpTURhK2ria5thH4sxjt0ZGwYBLaoY6SILU=; b=NCG4KTJL/iBuZmmBSU2rZ0HviN K0TYx2qhyKBwXf26oSvnw8H+t/MZ3lRA9rK/PQqv242eyL64eqRNcEwKnQ9g1ryW4nolNjlAch5vT 1a3dy1ndirbUx54f7roHlmneNU6nDzWAEE7ULqyYaImyg5dj3Rh80Ds2vhQO7FoYTvE60o9mab6Xd tG3I3SULMXtW/COD6vQHOaN6uJ0CveNwgQBKRipCu3iVAr5CTw95SvRznd+bLqVHsVS9fgTwav0/p IWCX3tRr3A1vIP8fqq5UM7ueTFzVZpfmb6nKOIxzFNhWR8+ZC5+1xSRXG6Re2jSXQnZfiyLp0EEMU qppY7GPg==; Received: from 108-216-168-194.lightspeed.mmphtn.sbcglobal.net ([108.216.168.194]:40086 helo=localhost.localdomain) by slmp-550-1.slc.westdc.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1mG17u-0006ul-Ew; Tue, 17 Aug 2021 09:35:41 -0600 From: Christopher Degawa To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Aug 2021 10:35:39 -0500 Message-Id: <20210817153539.188484-1-ccom@randomderp.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - slmp-550-1.slc.westdc.net X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - randomderp.com X-Get-Message-Sender-Via: slmp-550-1.slc.westdc.net: authenticated_id: ccom/from_h X-Authenticated-Sender: slmp-550-1.slc.westdc.net: ccom@randomderp.com X-Source: X-Source-Args: X-Source-Dir: Subject: [FFmpeg-devel] [PATCH] get_cabac_inline_x86: Don't inline if 32-bit clang on windows 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 Cc: Christopher Degawa Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iMfMZIt5B2fg Fixes https://trac.ffmpeg.org/ticket/8903 relevant https://github.com/msys2/MINGW-packages/discussions/9258 Signed-off-by: Christopher Degawa --- libavcodec/x86/cabac.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h index 53d74c541e..b046a56a6b 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -177,8 +177,13 @@ #if HAVE_7REGS && !BROKEN_COMPILER #define get_cabac_inline get_cabac_inline_x86 -static av_always_inline int get_cabac_inline_x86(CABACContext *c, - uint8_t *const state) +static +#if defined(_WIN32) && !defined(_WIN64) && defined(__clang__) +av_noinline +#else +av_always_inline +#endif +int get_cabac_inline_x86(CABACContext *c, uint8_t *const state) { int bit, tmp; #ifdef BROKEN_RELOCATIONS