From patchwork Thu Mar 28 23:10:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47620 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1667631pzb; Thu, 28 Mar 2024 16:12:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVBhUqnFe4R7xwz+7PPAlgNrlPbjrG6NjlT71svgCJYjJGY3G+RJlS+Lh8f/GpTNZoBZVINgDn0L4j2TDukF3HJxiEHNqvNpT2Llw== X-Google-Smtp-Source: AGHT+IE+d/GL5IGkZPnGbP4zEids7NH9ABHyW+VQ1FcRayStIWjexgupmu/5E6KM4yYiEJoR7y4D X-Received: by 2002:a50:f611:0:b0:56b:9f91:d26b with SMTP id c17-20020a50f611000000b0056b9f91d26bmr416647edn.14.1711667528742; Thu, 28 Mar 2024 16:12:08 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i27-20020a50d75b000000b0056bee22bf15si1195160edj.533.2024.03.28.16.12.02; Thu, 28 Mar 2024 16:12:08 -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=@outlook.com header.s=selector1 header.b="Yii7w///"; arc=fail (body hash mismatch); 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECCE168D770; Fri, 29 Mar 2024 01:11:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8030D68D750 for ; Fri, 29 Mar 2024 01:11:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lo9mnOAgH4gTkjD3XzFlFRTuluu/sg4zkyIwzQXVg/rvfSgbco/seJF0EnIUAEatzLC3iHeT7n2GDFsFfEOV13Hr01xZmZwvRWHG/bfP9V01lUjbJmZKLFVBMGsLbIgXNXhpDa5hhN+A/glJr+raMfmwQWzAQ2lHFT9O883gS+Dwf+eFzh8gsaRE6JxR43AcvCjtTeQ8JMxy4ASVwVOnvroMRza/hJ2xR7tBMFIdzgHBCt2IV2lBYBVtJjW03NfEJEkvF+cU1EWL157Dl3Q81lUxXJNrL2WHg8B3D87fDSvrQ0vtL3INjoRaV5YexPfX6tZplcoYgmpFm954eOBqIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yS4QxNSCfiuXBxeBmoNN8Qh03yG6TPNjc/8wsuhFwnQ=; b=Vkbgn/yATZgXiKDWybVvQHvGyRUYD/LIRAem+CqBDK57ojzEpd2lyQAXQt3ufTaBFKIHXRW1X0rWAaikU2kOBIQB1eKQ8UCxTk65R37OCYh0LwTBJABrAf6AWuvqgFDDGj8DsiqObhKLuWKM56KCux5rk2VoqbCT/0DkjFfgdO/IKA3mDHQ3GHiwXi3dS3s4uCBkvWOFXj+02j7SW7QUEFPuKL6tSXmqr0AgBOXW2YY3dnjTouCw5bdJbUbJExaoPp2d7MFlc3T2OTBav68bmywsYPSAMtX7UP6Z8KK8sXbIywoqNFCXHMzlV+4VPwIirs9Rg+M4UscgDwaUapfHbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yS4QxNSCfiuXBxeBmoNN8Qh03yG6TPNjc/8wsuhFwnQ=; b=Yii7w///vz+zYZTHEy2GVsDEtqFfVEFF3Y6IR4ex9nloxhijzUBBwG0glf7D3sHVAMaJZ4fJgiQKz8+A1trTqTxH4/CfSp3UsrSSo1zGhPHfGD5gzXNyn/MPKnK/F5gt5UuDslQEAyzkZuPa1j5NQ9D7Kre0LWNxC4+DzZLNmOTgnpLw4H3JpAuuqaF8bnZ76Y7ult/gJ+kHMZYoCXDFEQxCb/aqIfiQp4f1AMyx5TIW7ByNfTekUcEA7eirHpbNq5K8dmbtZOm0Zmw3ZKlMotpfE8+BFdoF7cotO4b7FliExymqaLUnoU0XCpzzHCZ2BFYnhqoGHk1GXc1IIkPGhQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0553.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Thu, 28 Mar 2024 23:11:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7409.039; Thu, 28 Mar 2024 23:11:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 00:10:37 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [8FIlBWs7qDQEuP/90Q0/n7lfrHW2wGkTLo7cz6y0zYQ=] X-ClientProxiedBy: ZR0P278CA0093.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240328231047.2202386-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0553:EE_ X-MS-Office365-Filtering-Correlation-Id: c79a113c-f405-4c42-1a3a-08dc4f7c5e16 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2g6AYuFgKlHPHEwdhVPFyl4SRlWbz+YitZFy88oLB+vWSNCd8itjga+DAwWujvS7VhUIVtdsy06xrRHQWkGUthgJ1w1jIuT14n6ySs+RNgdBYyKPj27R3WDjKPjyqnnVKIbAlnYORd83cylwZWy6+eLbct1j5Q87IHNugn03Cp70Wxk+6yUv9pfbxWLbGlkstjNnDTbg8tspR4OgbAgjvFANn1St1AZ2mKYBacdOBKsvGoxInbb3hC820uASCRxxKmb8gwLLYCs5a7GM82bCfJn1cDJQAJgTSLIO/lrBB4oocvr7B/+tMSO0IiPp9V+SWjJGV78Un5ry7D0++AyACHe4LsIHl7MzdO9UKhf6qCDa2cfqmgPv2RJfvxqNU3Q94d/9HMFemVPDOmDtbDqwOLGE6Eo2mBqHg/PvgCb3r635CbvSCTpJ3DyjKqwDF+/+cPnzoxzYt4LCfqGE7VAFKWsr4bYW92lKgecQv2wl49MlPmXuWKUg9YF93oQNQfpCovKI+JcF9hIapFXBB3qOic3D1y52mT/Tu7m9uPHfonMWcxA+C1BtWLMPRUTOy18f2DOOXncy5w58llXTuqW+oYMRZAz9MBSVvTEq5w0zujWW3uOLs/ged9DGpF48OUz+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yNDcr+Wpmn3actaSR5iBB4R3Mo6auwseG0I9Tua2hZYa/fnbTaVsCBLmzxkeNKVfRtVdQhwnhEAU/vYEDQRySy83Gj1qb2zoMlPBaAsUG2p/d0/1l3oxx9i/JIqUx6xrfWZDRKxV1mYRpjuqV0VMwcmS5AsveZPBsLFfbvoSgmK3/Y+r1brqm2M9PIrZ3Fa/z9uoAe4WxIC6VmQhntvU8wxHFEK83D4S3tQeGYMVk0PqnWuF2c3RCL6Bt4DVEdo84C8latKiy9cUHhZSz6DMSM6Q/INVL5kxB/baRTC2OeKmLGOJ/IY28HIoar95+2jXuwPOsqIu79amBDQW9fJujEaAM1mAYiYtDS86dTf+Za8I6hENQ94OENBVwzvO8r9sQAv3RmxXoO5yP8yPR41IW4fH++o196b0dHReCW+q3rYGMQGMPSh/WV6GKYcBi6U95hPUEm+AZ2L//wO1+gp74uvsii6fqSftNt4K5qzJftW8JPukcnMfEEQIL4bjlW9o/59W6LxCZp62nOOCUv6n2yx+w5GViqFD/2aByOogTm/RD8Z0zH1dRulj8QWNSDV2ecBa2x4RaoXY0I26r7RMndI0rA2dZzzU/hnCdiow8V3IjnKkkHSNYBaHExYzH95vIYRjP7qUnzwkNiIM5VV8Q+uJxyN2aohE2l+G/QuKVbFilhAjOyrKdB/26dw8I2O5gCrn+AA1k8nV7DHTJJyaiqivC9lMs2IBvltCdFjz5/685K1kb/PNdP6XwHrhaU2W77mwK2Cc0RTgk8DhOMbESQook7ebwF9q2+gp1uyYBZLlvnuRkP3cufEaS9DuWS0a9Jr8No1Gy/jEq9HZsstT7YyeJne2691D2qGv+tnd9duckfq2u7XV0xbUAUv+Vnlqa4LcItPw10xO91MYipbq0M19XttrYlglfISff5RWRdWOYyoim1fwfeJpLK3E0qXAFYoXuzA0safubmPq0hDBWR1NVYGQ3uQqMnxulYi/BBsqUUQK0mqB7Z3JCfwXnOtjZUAD81TkFo9GII2EYqBJg/C+zYsVR2hW2RZUhFoPU+Gj83A0OW483/e28+dRr8qkTyVZwSUUGGBS3QsPG58Hz6VMFO/dNCKkP2FORRElv2bnsWtjVDGLp15fflv0vy185l6BgK+eZZdxktkkisYKmfwaYa2WgAYsiMkbzZSmb1fCb7xBs9GPR/vOCZay6fHl22k4+mQtSHHYwAOIfRUMAfgJWQ4UQbSTUftbpWmkrXCUsF+bmVQyPLWlE1q30h3GHad1IkLjQ9kL3CSUei7Ofw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c79a113c-f405-4c42-1a3a-08dc4f7c5e16 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 23:11:15.4879 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1P250MB0553 Subject: [FFmpeg-devel] [PATCH 08/18] avcodec/msmpeg4: Don't include x86-specific header unconditionally 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gQOq/3PnZo3k Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index a2c4c57728..e327bf36a7 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -27,13 +27,17 @@ * MSMPEG4 backend for encoder and decoder */ +#include "config.h" + #include "libavutil/thread.h" +#if ARCH_X86 +#include "libavutil/x86/asm.h" +#endif #include "avcodec.h" #include "idctdsp.h" #include "mpegvideo.h" #include "msmpeg4.h" -#include "libavutil/x86/asm.h" #include "mpeg4videodata.h" #include "msmpeg4data.h" #include "msmpeg4_vc1_data.h"