From patchwork Mon Aug 22 15:10:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1352798pzh; Mon, 22 Aug 2022 08:11:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR7lAKHQ+XndwBemtGN0kXwB3/7LgU3wjFvCgK0OixTDmbcyFQjRJ/fsDTeD9lUuyCTLO7xC X-Received: by 2002:a17:906:5d04:b0:722:f46c:b891 with SMTP id g4-20020a1709065d0400b00722f46cb891mr13360582ejt.4.1661181117172; Mon, 22 Aug 2022 08:11:57 -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 u6-20020aa7d986000000b0043d84f9413dsi8534344eds.604.2022.08.22.08.11.53; Mon, 22 Aug 2022 08:11:57 -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=Lsq3DheY; 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 79B9D68BA4F; Mon, 22 Aug 2022 18:11:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075079.outbound.protection.outlook.com [40.92.75.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BED2B68BA12 for ; Mon, 22 Aug 2022 18:10:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K/TYX4JnHdADT1S5KHT0K0lg6G/iy2rv94UwadIoDjjir/IfV4xJJuCHMxV03hQqhyoghvrM0RXos4eNSX1PwVDmkMzHPqTOD39l19uiCjsth3S7jS49MilOvHtE2dkmTSclGzzvzvKVyY9HnqYZjPD1KRwreZVIbTbycYXtKJyf6/LuKJfDClSEu8u51HH2iNyI6oFgXIRrScHiNWvGt1ltrQGjX/wBu4LtBinp7F66rvXNV87S0p89Wnlrni5j1dl4SDnwfXMpLw95imTx4pb5bcqf9FQ6UzN+PVnCA8W5wYl0ycv5QCY5A1wlwrNoelfbDb3gsGJhbSTeEgCuRg== 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=1uVbztsP0JYsDEUviq0lXCj1pMthZqoLkIFLdipQ3po=; b=Su2dCx2b03nbLsPfzQ6igVcOl8C9vWKN22SEciNKmBnxAd7AcFhSUjOHGe/Xsy9/9uuBK3v88+5uyEAbGpksVDSbdMM+5AptnLRWhadhB/EsOA0Vngx+TU3ZWZrTVXcxIT9wPiuxd7z8zbwA8w5KWuqePy5soXH0hAwZqTyH46dCiWoiuAxXRyCh54wj3np31kL2OEw1f8f1A5zpXX5g8xxjYYDhIsHLKFuzlXhjjhQlnEdsCzka/ReCzdQAR03E6DFPVimFJn3LZ5vJvO0a7mkFhGpXbjRSauWrjmRFCrMdpZhHMa1HJ4Y/UeWTBmlfm3nPdyVNa5ziKYFgkmXcQw== 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=1uVbztsP0JYsDEUviq0lXCj1pMthZqoLkIFLdipQ3po=; b=Lsq3DheY8sx9xPM1vOf6Eb8KYs+/dY6zB+g8XeUIRlm8fzKjyuMlTpsaZDEsT0UJ2k/qJdODi253m2ANw4RyO4ye8OAlRfOAwYrt+0grjGGz+OfqHGzjtVpJ4VEnWFFLccLpJ1zzMTINdrp7ZJ0NuSQg0EmOtyhzzHsR40uAL0i6DBVENDMyWsZVzS9zQl9IdE3CkazRnRbRd5xp92A1B9hb6eRDsR9kAp07Tvgq5E+0CRi3UDLI5LjYMG96e77vk/BfiexF9Nq3dJpP94guUkEobYOCh/WiKs+XJsEsHqhd7nlKQWeTdxT0MPIhcqOveoM3w80fnedKBMyMSfIAzw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DBBPR01MB7610.eurprd01.prod.exchangelabs.com (2603:10a6:10:1e5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Mon, 22 Aug 2022 15:10:48 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.022; Mon, 22 Aug 2022 15:10:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Aug 2022 17:10:15 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [dKVtkss2t40L9ybJab0KRyLzGKMxMUwf] X-ClientProxiedBy: ZR0P278CA0162.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220822151015.744845-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e146c9c2-cd3f-42b5-024c-08da84507e4c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQpdocItI9cpZOJb1SMVOX6+327evN5FjKbJ3KQv/fpc/JaE5vTUO0n0USu1jp1R2IRYViMD7lCnuZsIi49pwWXDqM+NM9AiEgXv0oW9Iqbf8wSAPJX9qBduQ1QI6rVhOw5CfxC+bFzJF/Qi+SFVFicab4WuXfUFx0LBTgI5wnacakLTt6vMbx7j0Q6k4s/weDlbbPFaM+w/NQA98VFfSrJlqUpcXFffh45ZVXOPM9Ik08178un45WFjhOK1edGJwcWQ9dWV6yoycXzj4XU4uVr0aE2kDWwQcyUODcImKCcK0U4pE4WkqdgQ2ov8pFSWUDog+SjCcBFrrZRwNbaT31uMbyeBRS3fu67yTXCKsUZnJ56IsdQjlPuqAoO6yt1vsetY583Gxyf3jgOGBl1K9pK5CRM4z3S2iTqYOAKwXXbHL2UCG5Es7oDRSEbfpMwSfwCRnVzqbaK4qIwYTXbwKITBhkWPL8xuFYtaOnEZXmvbEqF+0iAUcG+ZV7XVh/gWeoBuMiTyR7hGMPT8tN3GHpwwvckC+JMRRY2DHTxMOLutb6ULCNueLvsWzFAbgIojdgVvDr8jchuWfQjSjo3M2NyIc9DUKlyidpWuAYGOWy39MGiJIWT9fpOHvgBf1eOu21DE+w/4PXk46PNYFDS2frzQfCgFAD7upnKgTsnRZgN8TrJ72lfg1E0xZZEGFObPZPYf1q5tbM8T9hpanizlKFJ7VqAJWtlGH5B9jRH8AdOIL44wXjc4vWJqfBU5KLPd1s= X-MS-TrafficTypeDiagnostic: DBBPR01MB7610:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Avn0SNNmuywpctf3UY43ggZ+h9golY6m1G4wzmTqycB5yzdHkQXtmKmntPvu57DOs29eyYtiShM7YoRxirSooi2DktI/myDwVK+BwhTCGu2wlL51U2VJObMYcg9B/CLtDWn6uw5dFBvOJQuCkmKRDRA/HmvWSH7jepWITSBEITct6FW1UJv5JydcUaQerhBRT2xcv0x2bpORJnMHRFwdcBE7mWhTwQLo93B2upkFG8HwNVFy2CBso5JwmmVUd4y9RbuAAY5S7RsMLyjVVGvDmLbdWyJJb76gnUO5YRbZTpwyIadE459sgXCVTEA4piHvU53V3j/4hY/BNwV22xlTd9eWbzBA51SE9XUp7TL3iTNqzLQY+niX5RybqCT80v3vQxi6zghtnw/XKGgwmxe+Uw5F72CG/8IZsMCzTyN7akDiU391X9z1ZtVUgCf1uE69VVbJHe2wSyggi6YNR3toulpxCn90d1C78la3kN5nR+hGhE0mb4WaJLrzdKD+qCMOxr4CaLO8KByih7Og0aeYx74OjdCn5N4Cbt2rlOLLKwXlc8Nq84yYPXPw6OV8wD59OvA+2qieSQdcWQT9cTiLYz4O58QWY73bpmNVh8OSyHP2TbhnwbhQW8yxyjfpSCgHvS/LVmuIMW94J18SPkVZKg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rlb2wceIVxm1bHYH6zWo0PG+pco2k2kNJqR3GdaRBy9BOiElF+NZPz03L7KsB6JXx6SUimub0QhdtbqbKNS6VlbO8XPu3isaF6/ejMwaBx9fECC33fSPkBzC4xvIaZbAnlu/sD2li147YmGTegx4PTv4GGt/7nW6+rmbDu/vrxi72oyuNqX5mPq2estiKT1z2SuSN4ZVHu4cOsIlje/nB08ycXE3H7cKT+vGAHZidUaS+CdStaDTh+PvVjkAPtP81WGVQSeqejD9L0b9Ee9NGRuageCJa/GB7Ym6uPx2icB4Tm6wMEPPtXb6gBbuj9OLlGBENM/p4a8vtRUEwWyHal+mKWnhDwy22nrxvOFNWhOtwR8GhkMg5SmHgbhToEHpTBQTxRuDEVXe02sqo47sG+TMCBi1LL1JsStHj/vC8DeVwxVmm+lLTwyAwUQGRQhjv1AS26q+qjP0cm+SAxEPqbXJrpNX+Z0MrfaIkbJ7GepsfqAdnJxMAqCdiqzdovRAdp/wFYSYETmkSiZcjwFvnFweUY4jAhx1TIA9a/TiikbJcRv5zEr5I5Bq75QyMCmsnzzYcLvxPxFzMyhLJmx/00a5/3lN1ykel3xfHwhI3eYwfaisT/kp/SFDeV723e0wSU6w1F82oMdBsKIzOllBvH+zgL8ParoU3KlIwasOC+SqrrEa10djyDWuz3OSEHoN4fHwHVUpEWcQXQnrmTOtakRbrxqB+z4AReB4J4dqxZQCBQO1UcEkYLlzWNd2CneTvhhic6D/6q1Kb25g1DWHAJLjJtYIMlaFcLWA7ohe/3Heuw1hPCTzvxYXhD5xnkMKK94bKTui+u/q+7dPOFuTFWZsr+tkC5y2H7u1okWLlRQKhq2hvStG+4YJ3W0jWLJyNQfROTvekmbPNO49T9RFTuioIGR+E75LgdjKMJE75lcb/TLwgDDVXuauIRGTtP/c+p+D7ZDqzaLoqoFN+RP0tNpmmN7MgojFyLAs8g+sKM64kzhObfTMphreBjsP7DidI3aZ+aeM2sf3Cl9nzZpgoNa4mHciE0KMzwEYN1cwLjnEUiv7X852i70x2dKcLoBK0ZEAlVJxFYq34m/MOhEn/r8qOQ1/OCIdo5xzR83aBlJNmFhuUmNH2rDs6zouF9NwRcjAjsGQrpOJoTkrBgLAc5lIqzP0duYSz+bRLqoQrlBxIuZqix8ymN41JR8oO+speVzhiVQCNslMN82XZJDeL1b5nvwBtOPAPOlkduS2D784XsvnrDnqGX37JpRj0AFQ/3uFHaEt8pv8xgWuTTHRdEboemzYpxslbPjA9NhPASU= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e146c9c2-cd3f-42b5-024c-08da84507e4c X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2022 15:10:48.0631 (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: DBBPR01MB7610 Subject: [FFmpeg-devel] [PATCH 10/10] avutil/mem_internal: Fix headers 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: a/OVxszhKDwh Including avassert.h is unnecessary since commit 786be70e28fe739b8e49893fa13ae4652a68d1ea. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/h264_qpel.c | 1 + libavutil/mem_internal.h | 3 ++- libavutil/tx.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index b9b1edcd9e..2df4c11f82 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -20,6 +20,7 @@ */ #include "libavutil/attributes.h" +#include "libavutil/avassert.h" #include "libavutil/cpu.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h index ed846aac52..955e31a698 100644 --- a/libavutil/mem_internal.h +++ b/libavutil/mem_internal.h @@ -25,7 +25,8 @@ #include -#include "avassert.h" +#include "attributes.h" +#include "macros.h" #include "mem.h" #include "version.h" diff --git a/libavutil/tx.c b/libavutil/tx.c index e6fcf9f451..c90ca509f5 100644 --- a/libavutil/tx.c +++ b/libavutil/tx.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avassert.h" #include "cpu.h" #include "qsort.h" #include "bprint.h"