From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 0FB084C357 for ; Thu, 4 Sep 2025 12:27:45 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'Qm3N3RmcEQHuVCAfdS2q9qf23TrhPBMEGjZPVt+ib+g=', expected b'sCIyldrUfWesh387lgdCcCLdVxGRsWWnx17x5G0aQuU=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756988850; h=mime-version : to : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=Qm3N3RmcEQHuVCAfdS2q9qf23TrhPBMEGjZPVt+ib+g=; b=rnu7Vj8FiycTjoKbIDWKG6VkciC1/3EtniZL31R1uOyB1vSiSVhR2NG3AyC2pQrU4J9gA VWwE5XmlqpJ6ue10dsHtgetO/RrBfIHieFMq2IroeSHVuVsIYnB3+K6E0XZMcYQzmsvMWfR 5QatRk+YT/QnN/6LE7IoMBKlsXRHCsfE2A4apd4FGo0Onrd2ctLeKRigv86jRzUPaRS2Vid z9daCaT2Tin6/vNQ+LpDK321c6mMHesOf1EB4GZqDGce55sheuS4iLMQv75fH0F2iUasfTy Nc3L3kbwOpcKCPjptvSpOX/yGSOaIW0/p1NjRAEE9CFW9JTs0EkEMmcWf2qA== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id B249A68E776; Thu, 4 Sep 2025 15:27:30 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1756988835; b=QVNqeOCLo4ioXOigonJ8/o2bEhrowrs4/Cblxezpg71hmXe0Vv4IZ+QWNqIXmheeyzKZF p57l7wIBjwO4srDny8vRyjeAShriOS33O1TkjgrVdIMrURlKX52k8z2iZ3Vz3NvYFPsRoHI EiSn0X4wJH6MPWxyC8B2MLc0q65Lhz4h48WKOK5g7IN9bf7i5HD1x7DA8C/fxvunKZ9gpRf zlEXUO4PDHj5wIPlYpFVgYLi97n5iSI3OzoKOo8so3AfyN5Z42Yuwu9XW+LLPAmGA7bSsQ3 MIXwjjPODhDBaOVUOqTGlXCSrmjSuMpcADBicAOsYEU/0UrC4hm8ArqgeP/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1756988835; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : 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=F2F5FuFk8B6x3DbO+Nhcg+wv2maxeFQ1qEiFRH0whQU=; b=njFtlsVHVnlkeHj0GM0Fa3vQov9RGb1OrUTCE8o0xxdfyzOk4M/1nmHDjot6lFxSRiZuV gI0v2j9LFhKIVRV7vhNCIjr16QOJjTLXydq6tPEx0+XFtMeMeireI8lXBa2c6yXQei0+9OT OW0vlPQ7fn94Acy0wWInI4dPHWIQX3IQPwYxzRBMXFtLJ83nTJ7b6z1lajuyQVBKIpnrSK1 EqHj6HLIo5YyII+JdfoThRFN3CCWASyvY1KWaZ9nfxT1/AY+linL6ErNQ0gVdm8hVfQ/wue OL3GU7FVx/qR3UFyH9PhM05DHWnwEMTGAnuwvUbbW1FNykSZJARJT14Ky9zA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756988825; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : from; bh=sCIyldrUfWesh387lgdCcCLdVxGRsWWnx17x5G0aQuU=; b=MNWwYlaAIf0DZGGL51ACBd+1AmaeYLAsndLsMpyqIKs4K9ZvOJwaHdTxbDW0aubO7hHdP fqxp6lTPDgBhPENByPsv7LpWDgTR5ATPhqjZQoCswTee2fi30HnfuL8g/lvogVQn7+AszzX qLHTknxrR3afyU/QEQ7o/mbm4wrAQ1noAf9fRLKivOTq2LIsI9Wl+clAuIgxesg0rZ3VDvT ap1NG7H+qhV0I8DLYo2epZYlgUABajdRRSzRo7YSeGDDX9lX7VVYAQB5phtyIMvLe99e1zc grcQ3v2Hja/J+7XA+KhtAMsOPhN62XnfmL73hDbUTizsmpNWIadAJdpf1eqw== Received: from 5d8f51c41678 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A51A4680106 for ; Thu, 4 Sep 2025 15:27:05 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Message-ID: <175698882598.25.18147378528444330545@463a07221176> Message-ID-Hash: U5WQ33H66OQTA4WTQ6WP36TIHRJFACXI X-Message-ID-Hash: U5WQ33H66OQTA4WTQ6WP36TIHRJFACXI X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] swscale/ops: Fix linking with x86 assembly disabled (PR #20432) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: mkver via ffmpeg-devel Cc: mkver Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20432 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20432 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20432.patch Also use "" instead of <> to include our own headers. >>From fec72a6ead263021148530ec6a97de0c0e56cb0f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 4 Sep 2025 14:01:20 +0200 Subject: [PATCH 1/2] swscale/ops: Fix linking with x86 assembly disabled Signed-off-by: Andreas Rheinhardt --- libswscale/ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/ops.c b/libswscale/ops.c index e8c05587e1..21aeb16931 100644 --- a/libswscale/ops.c +++ b/libswscale/ops.c @@ -33,7 +33,7 @@ extern const SwsOpBackend backend_x86; const SwsOpBackend * const ff_sws_op_backends[] = { &backend_murder, -#if ARCH_X86_64 +#if ARCH_X86_64 && HAVE_X86ASM &backend_x86, #endif &backend_c, -- 2.49.1 >>From c6dc5d299e1b4f2730691910b1b9cfaa0092166b Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 4 Sep 2025 14:16:45 +0200 Subject: [PATCH 2/2] all: Use "" instead of <> to include internal headers Signed-off-by: Andreas Rheinhardt --- fftools/textformat/tf_mermaid.c | 7 +++---- libavfilter/vf_colordetect.h | 5 ++--- libavfilter/vf_deshake_opencl.c | 2 +- libswscale/ops_optimizer.c | 2 +- libswscale/x86/ops.c | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/fftools/textformat/tf_mermaid.c b/fftools/textformat/tf_mermaid.c index 6af58d58c2..ef730d570b 100644 --- a/fftools/textformat/tf_mermaid.c +++ b/fftools/textformat/tf_mermaid.c @@ -27,10 +27,9 @@ #include "avtextformat.h" #include "tf_internal.h" #include "tf_mermaid.h" -#include -#include -#include -#include +#include "libavutil/bprint.h" +#include "libavutil/mem.h" +#include "libavutil/opt.h" static const char *init_directive = "" diff --git a/libavfilter/vf_colordetect.h b/libavfilter/vf_colordetect.h index 95f30a6ac2..aa974bb1fd 100644 --- a/libavfilter/vf_colordetect.h +++ b/libavfilter/vf_colordetect.h @@ -22,9 +22,8 @@ #include #include -#include -#include -#include +#include "libavutil/avassert.h" +#include "libavutil/pixfmt.h" enum FFAlphaDetect { FF_ALPHA_NONE = -1, diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c index dc3df0e989..1dc5486613 100644 --- a/libavfilter/vf_deshake_opencl.c +++ b/libavfilter/vf_deshake_opencl.c @@ -46,7 +46,7 @@ */ #include -#include +#include "libavutil/lfg.h" #include "libavutil/opt.h" #include "libavutil/mem.h" #include "libavutil/fifo.h" diff --git a/libswscale/ops_optimizer.c b/libswscale/ops_optimizer.c index c28c2c36bb..b13e7ebdc1 100644 --- a/libswscale/ops_optimizer.c +++ b/libswscale/ops_optimizer.c @@ -19,7 +19,7 @@ */ #include "libavutil/avassert.h" -#include +#include "libavutil/bswap.h" #include "libavutil/rational.h" #include "ops.h" diff --git a/libswscale/x86/ops.c b/libswscale/x86/ops.c index 8704f77227..3b5a060f64 100644 --- a/libswscale/x86/ops.c +++ b/libswscale/x86/ops.c @@ -20,8 +20,8 @@ #include -#include -#include +#include "libavutil/avassert.h" +#include "libavutil/mem.h" #include "../ops_chain.h" -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org