From patchwork Sat Jul 29 19:07:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "L. E. Segovia" X-Patchwork-Id: 43027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7927:b0:130:ccc6:6c4b with SMTP id b39csp1486537pzg; Sat, 29 Jul 2023 12:07:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlFLPxK/fOaINM1U4eJwZTgHya6POOgNSLRECLA3F3Kq/KNFUnPf0I4TOxabSpJiZUHYcxfR X-Received: by 2002:aa7:d889:0:b0:522:2bc7:1c57 with SMTP id u9-20020aa7d889000000b005222bc71c57mr4446986edq.33.1690657667374; Sat, 29 Jul 2023 12:07:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690657667; cv=none; d=google.com; s=arc-20160816; b=0qiF8SbQtztoQjugBnTZW/RqAcRl7PSjyJdyMnJO65HElYCLJ5YWRUYlIEXcCuLWsv wgGyNFO9RM7gruUHl/DU+ld9VznTC3risSHDeJEdonWEfCMCdXLSNc7Y4KpihaNY4mw4 CGmcvhVStM70V1mOklWDqlHvUghHu9WUeNL0XBpwHnUf8+5iu67BXnsT/jXKxmnuD8AM xbYAA5vxMaRhV8HD+312w8LTfw3PRCTpzq5T8FgMAAuZs8BxFEubj7E9sklk5p0ghcVL r04ZXDskgB52v3UeCJincoibFeySYR52flbgfzq5BPCUr4tQ77zfW4ZVSEqRe+3bYC6z 3kgg== 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:in-reply-to:content-language:references:to:from :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=Kwj7eKHWOMQH7vFUdB/hPrCb1bZLPCPPLwaZKlQ1iAQ=; fh=ESc3qdU44dcJCICb6LyFA8dwP9m5t2kvrhWue0vN394=; b=p6rNsh60NDC3RPaVc0TCUvUBQ4ChpmWjSrWBRtv3QRXdsv2xlA72xy6oxLj0KxQdiy p8yYycZnLSOVI86YFQp1/pI+HgnFBf/B9MtUgoa55zlSidy2yPTv0apkqv20Fixxa6MJ 8l87k5+YSYBSksEjt1c2yVQN+oDjUN6yiPh5BoY2ltDmLI7iNa6L9C94nN9bBNGMMW3i u5/uvBqpUE9mzbTb6hHrRwqp5j2JkR1DFXIXwEuaL7G3SFRfnC4RN4v3/R4uJEoP1Xma QvIi6cJnBbH5/ZfZc90nV6WJeN4Rwx6aJDI5TelEaowS65RhIrfuNm3NH8isCn9p6jrY H7dQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@amyspark.me header.s=gm1 header.b=Z7LQtOah; 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 c3-20020aa7c983000000b00516333867fcsi4417255edt.593.2023.07.29.12.07.47; Sat, 29 Jul 2023 12:07: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=Z7LQtOah; 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 3CDC568C7A0; Sat, 29 Jul 2023 22:07:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E593868C88F for ; Sat, 29 Jul 2023 22:07:37 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6E4FFC0005; Sat, 29 Jul 2023 19:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amyspark.me; s=gm1; t=1690657657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sTnx2dW9tcgNIJY5h9LEdDMHAuxNkBrNNfunGw3Jk10=; b=Z7LQtOahaxpL7AqvXBXepKTz8BrZLrK25kf7lbkKBhwTugZeaMjcWWvnbKoYmIqtjNIBk1 /4SgmpaVlSLsDnPE1HQ0cKL1RQzNs6O6AaXfg8L92h1qG7Wd/lYL/72FhS654TE8qP0Zn2 7p2m2L8P2Dveps8fG8Qf4Ludrkl3XDjjNIuAINQSIcbRYm/3pILOYSDqm3pHd0E9es7/NB FAoRpNidUn3cmk9cELSIQpIMuH9kEbTLoKbWcggMb5FG47r9xpbh2TdJt74NbAnU0Tkdur 1DNa+gorfPEV2MYSo0wvTsRybJbH+GyOt+b+S6uNlGsBwZchYSbfhCKrtkgYQw== Message-ID: Date: Sat, 29 Jul 2023 16:07:35 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: "L. E. Segovia" To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US In-Reply-To: X-GND-Sasl: amy@amyspark.me Subject: [FFmpeg-devel] [PATCH v5 3/4] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6PiW5CceLw10 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);