From patchwork Thu Nov 3 15:30:13 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: 39148 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp614706pzb; Thu, 3 Nov 2022 08:31:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5LxKkZronBpEj9GZzrL84z0EmUCSKFnmbVW5Da14TLHRufqgyIAclTJE+r5KcM3aY9mUY7 X-Received: by 2002:a05:6402:510c:b0:462:51ad:2af5 with SMTP id m12-20020a056402510c00b0046251ad2af5mr31242888edd.257.1667489473801; Thu, 03 Nov 2022 08:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667489473; cv=none; d=google.com; s=arc-20160816; b=UOJG/usBCjsgLXqVbos4e3oHip44XiXhlaRGi7fASlkJkztUBzy3RXSlPvdqeRYGMd /EkexTa2gRKBdoK6bNX4AMrf47M884CYz6+HN3eCnjVtry5cMBCWuS2eOdgRKGNZHE5U g7czHf9Bj+kUasVtPBpgmDrb3JfZh1Z+i9CnOOOXCzPj35oMd2qbTWDUtkvGklEMrUZp /o0o8IU9nt/ZctaBx5tMUcKsrRQYTvduIYIwo5vEbNCbBVloDBwgqKx8BeanhyapP808 Exs9FNpGc+T8UC9sGOmyFqYbcR33yJ7O/kWK0pS95thkSxC91ySSVUbP8FqjB9ZfJS3S QD+Q== 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=yIQdPZu3Ej4Ru8+eLPJ2gs+UodyObJ7JEbuL0KPOKMyXcmbBWJ/dvyI85GD9e4D1DK 82gWzBCCYrCiix4BAOSKWhElW5GJ9B5KnEeti3+ZHxR/kdgb3m+X56ew/VvpL5/Cynl0 RU04mTspqDTAA5oy91HJQhBOj+U8Oea2r9wOLTfnPVkuugEg5yvk7iEiwdChJtO3B87U zTFJWbYyWjbF737SDkSj4AGVQOY3Rdjij5x7+xA3pl8D+1Pw1LDOYUR/MXnVAA1DmJMt 25HARejuN0HENKZI6sSYS+x0tAgyN7IYxx2cPD1LkeI7t4/X6Sc3aM9Og26SL2YtdWCF x3cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@amyspark.me header.s=gm1 header.b=pnTKuWiu; 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 j14-20020a05640211ce00b00458ac23f0b8si1949073edw.399.2022.11.03.08.31.13; Thu, 03 Nov 2022 08:31:13 -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=pnTKuWiu; 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 994E068BFBB; Thu, 3 Nov 2022 17:30:47 +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 B28E268BFB7 for ; Thu, 3 Nov 2022 17:30:41 +0200 (EET) Received: (Authenticated sender: amy@amyspark.me) by mail.gandi.net (Postfix) with ESMTPSA id 3D7B024000C; Thu, 3 Nov 2022 15:30:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amyspark.me; s=gm1; t=1667489441; 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=pnTKuWiuCIl5Dl/Ta7/Q9TMVopsceFPOiQe8/XuFJoVc6O+AQpfMoMPpIzEZaAuioYF1A4 PDctkIkqZksWAz39XDFT932eSXdjRh/MJ/FGpq5xGspCqrHzfXLAvy2EQG8lz7zWjmLDzj j1R4S20NLrVbaYp+el97iXRVWpAIjs3YL4CpvBFNPWzfYXbAv+oblNSQ9smqOiJIPSCMly Rq7AItLMxJN7fGFQGSGVu19YJU8gUZID65OypUNAWkECM08dkuIeb9oGsIn1Yq8d6sS/+I YsEkMVqLepUGhW567xI9pnrKRVMnAkrKxBF+l3rcQXDQDFVypJ1qXsqRb0CB9Q== From: "L. E. Segovia" To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 15:30:13 +0000 Message-Id: <20221103153014.66226-5-amy@amyspark.me> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: 514n4c9J2+pA 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);