From patchwork Thu Nov 3 16:36:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. E. Segovia" X-Patchwork-Id: 39154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp653334pzb; Thu, 3 Nov 2022 09:37:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7fLuMUrWLrvsgHc1IRCj1IC9VLfRc7pDHAZOG6rfLQMq83zIIFXFc/p+xQI4d5VHsPcpCa X-Received: by 2002:aa7:c54b:0:b0:463:e966:d30c with SMTP id s11-20020aa7c54b000000b00463e966d30cmr11553197edr.222.1667493467290; Thu, 03 Nov 2022 09:37:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667493467; cv=none; d=google.com; s=arc-20160816; b=u1drg/N9VJU5WuArSGy0Sj00+Rfrnf+oycieHa+7pSTRipSUCRbDpVFiieqgYqAjor hD1iMIv/i7pCrVXGIENGkAYyFyU5c7r3Q46W2Q4oTmtdQMEUCEQBfE4/xoGBnBTLRsoP BXTcRUsUdXlQTKCqx71J2Ksx4aeuilolk/amYbJX9MON5k/+q653NADEFcHELeYn7s5y 8MRSCG4sN3WH4Wnkb4OjLHgnBeLXs43z0hADv/X0pyjMMA3qY0ascoPusVBBpnDXn04p xGf34tSTxHZcX6pqTgU4GGON3iJ3BxJdKX07Xu8G+djZeHq7tLYzveJW9J/cQOUo1u2B lBSw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=G8n7C2A66z1rX+mesr7FgI0N5W9JsczRBBpFyDf8nHM=; b=bokeYqnAuJEzCnQwPt685U/0JI/CggIm6S8T6yIVmtqxiNj6VM9mKyYIurGXnOLsSY L6A8EDjOsHgu+WOMx3Cm0/4emVmWCRQS2MK+0VOSSCpqBYQv4ViRN63a94jyEWfbUtRG CHIzS1ggH4jNZJb18yJoIPn9q/8j/KTiSm0Ue0xE8H52rZW16HPlPHJXfd3UWrQ04UDI U5Wf+TkSeLirDMIe9CHKNh3iqNN12bjOCFUka84Fuvp/FKZ947iE66Ub5tVy68UPYp+R EEavMIgvnSNuv4EaZIutfwD3mXiZYL5VfIOKmOh9CjlmQluOrC+h/lSAc9Vhk9mHceAm YsCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@amyspark.me header.s=gm1 header.b=JomEn3Xx; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amyspark.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b13-20020a056402278d00b0045d539f05a8si1937868ede.576.2022.11.03.09.37.46; Thu, 03 Nov 2022 09:37:47 -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=@amyspark.me header.s=gm1 header.b=JomEn3Xx; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amyspark.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B633768BFE3; Thu, 3 Nov 2022 18:37:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99D6468BFDA for ; Thu, 3 Nov 2022 18:37:01 +0200 (EET) Received: (Authenticated sender: amy@amyspark.me) by mail.gandi.net (Postfix) with ESMTPSA id 10A80240007; Thu, 3 Nov 2022 16:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amyspark.me; s=gm1; t=1667493421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kHnC8sp5nmEsb3hJqF8ckQwYRxBBeQD/g1RvG3AA7XM=; b=JomEn3XxFyyANghUKNsRTOaayti+AJ5/436DsVxq7aQPtcisIMDmiOWEYlHtQEzmd05dEW LregcG6Lk5l+HOr/cV7PrfDGkIYaRzqJmGUcyV5Ixrh/eg2jsM7EMIR6iiuLuMVbdEHPhg vs4+72f/OcgDHHmo9ECBNNQAJRr6fJj2SC2QvlXOqFdABmVcPL5EuUYOQGpuvRHLLo1e0Z mAQY2J7KL2nOQNuBsTksQX2WrNUdk4g0UbT+5zVc0bpdymlE+7N0DhfCZtNwTsAgytmpgX kIGakBGw3NPlPJGXSraHc5ljantqpnPSFP8skanHEt328whASn4lHAu9BMUGQQ== From: "L. E. Segovia" To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 16:36:36 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/5] all: Guard if (INLINE*) checks with #if HAVE_INLINE_ASM 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: Nirbheek Chauhan , Halla Rempt , =?utf-8?q?Tim-Philipp_M=C3=BCller?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AlcU4prMsGCy Continuation of 40e6575aa3eed64cd32bf28c00ae57edc5acb25a Signed-off-by: L. E. Segovia --- libavcodec/x86/hpeldsp_init.c | 2 ++ libavcodec/x86/vc1dsp_init.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index 09c48c341e..6bde5a3893 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -224,8 +224,10 @@ av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags) { int cpu_flags = av_get_cpu_flags(); +#if HAVE_INLINE_ASM if (INLINE_MMX(cpu_flags)) hpeldsp_init_mmx(c, flags); +#endif if (EXTERNAL_MMXEXT(cpu_flags)) hpeldsp_init_mmxext(c, flags); diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index bc63933e83..65fc28ea35 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -102,7 +102,7 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); -#if HAVE_6REGS +#if HAVE_6REGS && HAVE_INLINE_ASM if (INLINE_MMX(cpu_flags)) if (EXTERNAL_MMX(cpu_flags)) ff_vc1dsp_init_mmx(dsp);