From patchwork Mon Feb 14 18:41:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34284 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5760329nkb; Mon, 14 Feb 2022 10:42:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJGGgxMx+XJZ4T79vnvhJXUyIEPMlicNT2z2TXGmXVKt1fVJ91gKXHmmhOnUBZXE9YB4dy X-Received: by 2002:a05:6402:f1b:: with SMTP id i27mr102718eda.275.1644864128755; Mon, 14 Feb 2022 10:42:08 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s26si1659574edx.522.2022.02.14.10.42.07; Mon, 14 Feb 2022 10:42:08 -0800 (PST) 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=mZS+Fib8; 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 673BC68B183; Mon, 14 Feb 2022 20:42:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074052.outbound.protection.outlook.com [40.92.74.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3EAB68A717 for ; Mon, 14 Feb 2022 20:41:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nVmkmhk2bQTnrBHh4rwPUq2AWoGvAZUbfM7wjvLOtjsuf74bU9NNppbcfmcD3v9is0EGU9DxUqXPFqImuUYgub5gZ3rxPI+A/YLmyZ7J1KkgONk6oqZEMtztrLEGZFBEmR0Kw/58JbsTBi02KQLbziJAx+WIrysLlKcf6w4M1VvIFwsmV7wqqwqLsFNuB/6ua+h6Imq4B7Us4l171/cLVDZBIECmNYD7U9pydoRGS66e10kuUK+SrozhS+fOgeSVBhYbUtXgwQeEm9UY3PyTwrDVksyGJN+pldcKkgLYNg1ESiGNo9so/EXpAuPl+zUHVH/L7r/kBUlsMjAykxX/YA== 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=SeXSJ3+RWyxg11Q1j/pWWuCsyh3UwJTVpkLAWq5YZLs=; b=kCnXfRI2NqJdwnmwgeAl4Y3LuVR6mUlcgjceXPM+jOmuH5hy1ea7qCG+pfz2P9iwItUG8yw3w4uCcKGI4VpDD233MeR21v0yDJ4rZ6XUlgVFFEVK6kjlOE0vJ+1Y9pLKyY/yMgbTDH1dokxCbyHypW3fk9YTdCoY11hRNI+QqpzLJZz43bss9h3NM1CrqWk2O0PWyjLJh8C27GxbRr2lRQCBcTL9xJ/5VYoHq2as46bzrKdeQfnR6pMIIaJaOoiV1T/0P+crzJHPTr2rcCVBTdKmSB9u0rl7jxGJ1nq1/Bh+oe8QGx+up1aB8CW6OBt6NQT5TyZGzCH90vU+tg54iQ== 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=SeXSJ3+RWyxg11Q1j/pWWuCsyh3UwJTVpkLAWq5YZLs=; b=mZS+Fib8CNrA5pGfUZVZCFHTg6eM8XsLorFafvgi9EcpJjsqL6R0mO1NIpiT82x0f3YHxSgnWTBEyvWFORjQ8tY6U7IJSXSntcDyEfzPXi5SG04WpOJFXGI6YTsYJNdkiaDbzRUUl4lNaFGj6Rx2HHMmxPOgd/PtSVLqAdWm8H31h72prU+1rlnjhcFrIB7ODOgdsl/h48DU+OAnmZyXGJOCKFGWkBw5Cx2XzQU43U8uh/v/UB9dSAP5Xuhqn5O4yNHtrT3WRwG8RaSviPk0DQqHvkzDJ20LQjzgsWj5B6uKPRoJfjtA44fIoTl4xuukS0QOsu27WBHzJEtExjYuog== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by VI1PR03MB3102.eurprd03.prod.outlook.com (2603:10a6:802:2e::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Mon, 14 Feb 2022 18:41:54 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::a114:1ab8:c6:582f]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::a114:1ab8:c6:582f%9]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 18:41:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Feb 2022 19:41:44 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [2t0VHOmwWmx5Ka4v1NRsO8g1h5TjSsXn] X-ClientProxiedBy: AM6P191CA0040.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:7f::17) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20220214184144.28624-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cfb095c2-bde0-4b1a-e956-08d9efe9ab7e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQOZh+132vAj8q1ItGCgZjXdz+kZDrx0V9OYKmHx7bi8/UbCTWvL2UAfGSL9XSXEvBNg91RWnOROOSO74U9Q31cdk8a5JuHX5VYewgbPo/hxjsr7pzwF8yZAaeIyRRax86AA7Xov0zlrrbcERQTFxV0eoz9zwZL/VCtO6fuxDq3u+kS3bLVeF0CmTzyeey5GzSxNgxGU4Y2DVXgm2kpke05cKVP3Mh/YyfDR2xWlwsTJThIanIGlwLK3CM1ZCeixIp0lGd2mBamzjRbb03vj0z5HbJdA8LGJHArQ1oaoWINkYE5X0XF8vo0hntQUFs9FPoS8bybRrPUJo4TRjs6ua6UWbiLS6HaYU1jYXard9CO1a1Fa+Ct7LaNk//aloMV87Zwb6oqo+AuhSOnQaxEveEQbaKghQOipmHOAST74pRKJHgNJUErAVDnlLJAzol5E7jOxed5T1L1z9Z2RTcwV8s54n05OToJRrnGNrBn7FmKQTqhCeZ6GeC3rzAh6NGg3ar2XPYc8+rmOC5NA8rKbNyNagGT6/bVQneWtnWRVQBn97iw8Dx9fa8QeXnrAUJrOSOJakyEUPW62hUFbkEtrJPBPrTJTUE4a+9Sgyd/KW9I1frvpfT5E4U117JLfLEEOubsvjqEP7X2teUzPRLxy2xIuYqW+uULwaqsTb60s5Td8+bB/d+rerhKV93J0xhoF564UoNwraFx9Sbi3S/CzQEAI0fxQLEjdOa5S8EuyVOjh+dy4U5+emkn+JNdCUYK+bw= X-MS-TrafficTypeDiagnostic: VI1PR03MB3102:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IjWG8ekvDASkGAgptakZftJwzmWIKfFPsz7afxLZm8wqSAkBcWv5k1hqml/Nvsv4ARy5hlMkbUtUVPfi1DaP11PHrTC7m8F5lSqA3NL5hqxtuZ8L74Dm5DCBKktbuVLQ0SjnMtSPyeEW8fJoamlbr+zprvMXoD7wyBfsPkGzjsHz6ygRxTVVBizLawfu69KdwFeAGSmxhDiMcF9ptQJPiDobBKoIqVXxYKBb4VUySORC0vFmMIzIxtISf2niulj5F1eZFodtEYLLnW9ty/d8NpImMExPLu0mt+OxPFfjS1se4kw4wVeAlf45ES51LojcJjWjCdKG/dWFXOvciEbqojxddVoU4DryVpLRMp3/fTZqZ8GU5CTWG0fSHPgVzuyMx4y9+VKaI+jLgfOfmsqh7UjfsgUpXQbe/bRqdGMqArn5l5co7eNrVB1W8KR8AUhQiD9t4BPX3X/EdJo8osukW9c4TdS/yfo98rzQL8+/GPe1fgUxxfBZgkpnY0yJI/tLBtFAZjowJOEchUpbBf9Q8i/rRy3TTBJpAVR5ZkMXQzgs0G2ozly+frLm/Qm6PuHGTwipG95DYSHJtYR+LLDwXw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PCIJtHd0+KZ99vMhAzU6ZDYsG/NEKejTZzTGC4NPIJScxvf7uWDd78pPWzQdl28uPTlR3phQuVNL7+naLfGMhfwVEbvd40/jt3Pli/tCHEg+22OOV8hzUuG7jkXCrTV+26xQW/Fg3ihd9JpKdhI474NBhIrFOwgdUNQfO3sX00X0eQAvXKYAepgu+pCN2PxRYMjYha3LT/Y8ioUP0/EhY34P9h/boQklBl++QpczGJvA1khXBud1wwlELXYk9Ixvav0G+zFRYphhzUVIJnpnpa7xbLO4tBwkLxllFib4W9+dMS/utNIf0Et8uuwpqhcoFe+kWNGVXOt2Ziio2OUvQxXtxfDwo5oLG5xnC+VO8o/KhYa/ULXMujHZziz7DJf/L0MOu5jVC4Na01wYD2dGoLGi7v8+a0YDjH7qmoXLteb1+6/mztgs5AdW/slT59IRLn4uxIwWgiR6A/h8sp74zTYjkPhX7UgWqYa03esCH3/inYy9vN0gBSUGCNxqwGNkP5EwlgEcuTi/AVMCnsvWC+2P1J7Z+r4KdCnuuEsqqwyLeSQC5jY1dscdi3s+HWSSewWVPdz3wuC8vDWQcgHESSr/xCqZf3KKJXfev+/tvddmDrpi5VGyDlWc8KhLaKwPunlPDrWncrZUJZzL+ZhmOQ89lsqjRM0APaHYc4p/HkaG3qmtTr4uD5ylMFoTT0XYT52foKNS1uwDECqRroViRNCsYUptZumY+OoQ5hSJTf8QlFhhwmbV+1IzK515tHhYYbfi5Eyx4HUHDjvJU0Dyd7t7h2MH8mBAwiuVwtQYP36Ve3O8AfBEYoMG30t9XJwrxsK843k+2fLm8fNIWLntQOQCt4y1Hc4gFP/Ob711SHx6n4sNK+rOWfv8os/fU24yPuIUN8PkSTea4DECjIPPz7uMmMy3oEbJXOPOyWiA8Gf1/4RgEzkUazjVxaUPL6bYubvuirxXoMQVbWpvr7MQHQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfb095c2-bde0-4b1a-e956-08d9efe9ab7e X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 18:41:53.8743 (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: VI1PR03MB3102 Subject: [FFmpeg-devel] [PATCH] avutil/x86/emms: Don't unnecessarily include lavu/cpu.h 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: /w9BNINWmXE6 Only include it if it is needed, namely if __MMX__ is undefined. X86 is currently the only arch where lavu/cpu.h is basically automatically included (for internal development): #if ARCH_X86 is true, lavu/internal.h (which is basically included everywhere) includes lavu/x86/emms.h which can mask missing inclusions of lavu/cpu.h if the developer works on x86/x64. This has happened in 8e825ec3ab09d877f12dcf05d76902a8bb9c8b11 and also earlier (see 6d2365882f281f9452b31b91edb2e6a2d4f5ff08). By including said header only if necessary ordinary developer machines will behave like non-x86 arches, so that missing inclusions of cpu.h won't go unnoticed any more. Signed-off-by: Andreas Rheinhardt --- libavutil/x86/emms.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavutil/x86/emms.h b/libavutil/x86/emms.h index c21e34b451..8ceec110cf 100644 --- a/libavutil/x86/emms.h +++ b/libavutil/x86/emms.h @@ -21,11 +21,14 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/cpu.h" void avpriv_emms_asm(void); #if HAVE_MMX_INLINE +#ifndef __MMX__ +#include "libavutil/cpu.h" +#endif + # define emms_c emms_c /** * Empty mmx state. From patchwork Tue Feb 15 17:42:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34308 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp510230nkf; Tue, 15 Feb 2022 09:43:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUcnBm+egRAsXa4rqm0GIkdJxis4y7QDKPlTDk39oErCeXHS/T9o039qZLfIzMPUof5OFl X-Received: by 2002:a17:907:168b:: with SMTP id hc11mr161917ejc.676.1644947009526; Tue, 15 Feb 2022 09:43:29 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 21si22543413eji.830.2022.02.15.09.43.27; Tue, 15 Feb 2022 09:43:29 -0800 (PST) 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=dm+CVyNc; 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 ACF0568B181; Tue, 15 Feb 2022 19:43:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069108.outbound.protection.outlook.com [40.92.69.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C775C68AFC2 for ; Tue, 15 Feb 2022 19:43:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lsdudabPUeNCIiWsoI1tQwNho9UCQhnMTdmH0AyU8N9LLsKbR22yRx9aXIPdKQ8l60ORNlZ9m0XjL1nxk4r07CaZ0HzDlvJCrHlY6Ikq+1vSTShWXXij856/hNKspdjUZCvMJKkW+zLY09djRBUiEHv9rV1P1TcAJQr35UHgraxR5KN7l2MPtEwcT7NebsEm30yHp0t8+uiILA0Hp9SCPkWnxLXX5ZqBOLzaiEulmTL9obtDHw7I9cTv9w9IRgC1dZcPPM42OFS36PazN7VeV7alz3X2mmHLB9oqCY3Qh2XN6fKhuWy29XSOI8v34lGlfv50YYIyHt+eo2hXifGUeQ== 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=uiHoKbgGQVqKSnk6bqEQxP9awS7OhpJ5vEKsrc+1R2k=; b=eo+eQaBEDmGlwjsNcO6PTC4FG/KKy4Q/pzYFcVUVmHbsIAIaiCuUlUx8mSkHhm9XLjbL7XJywzKUOSLHQ0vkn4og8oEPhTGP5yWH5ON0ZksLBdinAQMaUMMcJ5WrZJ4riXg6ZeodDsUSxI91rji6gyZC7l8gatDprKhT4bwEerRtXe+Va48X0REV+lu3d4b/qIDW/uoY/wca9ADeZDl7yt2O3QtKwvXzX4hpKg6/kdj7oCwRq7y4msE6m8cO3svin1VAAiDslDBSkpzAtvALNGbZ8jE3UecWLGXXDW4aAURtXYszbqj/WyNqZj+kCpOB6eOtxfdfpSWAELI+lCPrgQ== 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=uiHoKbgGQVqKSnk6bqEQxP9awS7OhpJ5vEKsrc+1R2k=; b=dm+CVyNcjXfR6VvlyIDjsGIenA9RB8byddYQQhAUDmEBl7RD+wLZfiJtAdzLSKhM1S6VmIKUmC2ek+PFJOGqz+tkmsZM6znbZrV0WFWQulJp6zRZhVh49hTIk04uqLZ+u9WxEfXJQETO6h0mHm3kzGH8guvr8xQjdQGGaNtY/mHQtTH8Z+8Ek6+NROzDVAGOlq7+mL3uiP84BZ5/McaTlsyT9Ti0o2/5Gye18lRdmYTXWXTWWBjWGb+oWmDx8aoXyznbJl+TiDdNy4EOhJlY4np5vl+vASPwaXp7cdZd6zh07wF77ovG/VgahuLJm1TJ3tr2m7D4V1Lii+TliZEOuQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3138.eurprd03.prod.outlook.com (2603:10a6:206:17::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.15; Tue, 15 Feb 2022 17:43:16 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:50 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [n0gL1qvLKBdbJDN5mk83eTp2TE0eIQc9] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b8bff22-ec65-4cb7-5b8a-08d9f0aaa518 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVKLwpMcprvMJKpcsYktiuOYbqFyJVqBCu1fp9Q890i4LPefDMNWWfy1Xba0C+BAFmJ8oBi97ePNx+TCdChHiVM9U7v4Wa7W6ot7Ojw2QoEjaLMmcqq3VyWnK/29xmtn60PY7bb0nS2PnxV0iLo8W0evWgSifmdh659mVczCVKo/YmbSzlh1WBQCRK04zvM4+ON6PbE2NUwSP7K6xWKIYDDBlwJ0pNxFMzcd9+vr/2/JHPaTFD76LmbNC/0naieyCHMuqVfP4qxAXqNTYAwyc3FTgXzw3I/lgY8vk7ZU0ncvrLb6Lavh0Qa9oflhSjRrMGrUBnJjDnJC0NIF/7bF0Ia/OJ0VtbnwC0ggSz/8YYm1j3s8TWuxdOmkCG6jQcNgFkAw9A56eMWsPVI2tsf4KD+GWrRbPxf9iZNmI1DI9UI7Agh9KmloDvyrVIpCCk8ojZGRW+5ZH2nEGMgJfsNuoZJ2BsNSosUGosixEhbw2oMVpLXNX+YETW06B/SbTo+ysKeso6MCUfGAzPiPBOAHmiCnLqwtpvvnxcpPBbx0UoC8Q38rfUrjFvbO4xl559D6Tztuxm78z74tLKwWcN2DSxYtYmXX9nxAQJ5S+cPEFWuii5dj5GTxy3FQkvN2zlL/ABjC9+oAyedst/olfmHNX2GYiCHBJJcOgdSbr/jZG7IjeKe2dKWpjXTrO/a2v7E7i/P65AeCSFLxybXumR6dJ94nXBMU6DTnTk= X-MS-TrafficTypeDiagnostic: AM5PR03MB3138:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2Je6kyTr+y+sCvSmq10+ECx8SZv986yiyAp/ld/Kg0zxTom2alzWTZoKDk8V9QeOSeITAy04aG5VyL6YO2qu2X0Wq0EOT+aq6u6ZSIBZOT+lpfq+D4nR25Do1mAxEiugM+HrqgFN30T3ifaJWRPU5wOpHM3Y5bkh7c9EN3O1Kyh3cjAIY5dlHqN8JRvMBM2tnGVOfEYJve4cS5UvP7SXpGDS+C+1hqUxiO7vlQ1yL8Dfo/WmW6AvFMMJXVRgRrDBKm3NH9CDBLYZz34pm6CFBqU1tnShOk6drHe+lF3JUSMJmM8ggUAOO1lRRHUhy1w0Z2YsFgaZTIf05R4pwk+X8+QXSYrnkcgaUOHXF9Mo9gvGAwYAIMr22D0kPp73WaabHyQTfkM7SWm9nEyn4xGXquE6vbJAVmHFOGSkMRU9TYxiRM+f1ljRtiWUeGv8u6+Q7sf3yqKj/wV3Lf7ZPiOkp/Ru5Vy+4UodUP+KHYEVyWa0gs7giS8RmUd7L0QD4AYdBv6Du8IBmY2XZnILfELaW9THsTo9UxmerH1cCq/GWVjnJoRdY6pS4zu50cKxHPWy2MsW/S17/s57BDwcYNzT8Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JQ0pbekRBsgMpfcqcQq32XoNkd6ojT5WBGk5DyZs4LUKo8E+khbi1aImse9fktaTxFCboKmxSKycMftr+ddokOKW/yVspC2vl+iye8baivNPLI1uplmfSeT8ZhFNlV30MGQfj0m+4tIsRqjTlcrKxv2/T4oHELoxzMIkF0P6/e81EbUXr5zl7Yqbf2i2poHKIQ3jUBgnGxx0dnyBvNr3TMAiPo7Nuu4I8yC8+j3uLKBY4hkiHLWOMLCYpBMd4xmeBH6a83dRxldXMrGsZmUg4qTM2GMC/Xbs7c65B5qkVCRWPZLmw0SG5eHpG50P6dKEu22e8muEdR0/A6CWxHM4lqrD0a9WIFX+5KiB8LgIQhIlMwhce4xUbI1HAVgKRdLQG/SJpPPXz7BdvbA66RBul0Ev8EQ7Rtk+dGKWPa36Ynhd5LPi8AxqMF6uyyCLnCRF7Epp/PsjaqLcWJb84GLPgkYRsqGdHv5soMdvG61KmQbPzhvSHy5n6J19GyZ7/Gk+ZSX/SUPqPHGewMTv98O9cggwtJnZnLoGL9Lxp4WjxrQaDV2ldoqYyGY/mfCYAzKG5njnzMARf/6/71gC3SfhzWLlPqGGMP9fQKR/9xmisst/4bknoYemvYzW3f45LfIhis0mHUO7LqYlbsPWUzXXOAX+hEhF6eooBm1gZpziOaXGQ9wJywHMbl1T1B45aUW7MMGLOqm4M3IPZmcEJd+kjyY78PiWLijBmoQ66WbfvC4kwXm/6lykqsMEvjpKdccZunE5LRh40GBErCPHMyhD7SsRf3Gac2Swx3704BPeWiwLXBWdotw9R5wCv+2C8IOyDdpXYS1sAno8pLx/jChZ4ZJlm1R8bi9hXJOJdZgyOT75RGz1KfQo0w9N7UpyToZGuOh0ngma+24+6xEYAi2tZP3Hu5sf76DW5neMMKRmiStgclhrGLdf0NfyseysJ9EoTwTgYip3ojifTHlCoM4RqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b8bff22-ec65-4cb7-5b8a-08d9f0aaa518 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:16.2403 (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: AM5PR03MB3138 Subject: [FFmpeg-devel] [PATCH 02/19] avdevice/decklink_(common_c|dec|enc).h: Fix checkheaders 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: yxDL5jA4aD7d Signed-off-by: Andreas Rheinhardt --- libavdevice/decklink_common_c.h | 3 +++ libavdevice/decklink_dec.h | 2 ++ libavdevice/decklink_enc.h | 2 ++ 3 files changed, 7 insertions(+) diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index c2577210a6..75896ad32b 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -23,8 +23,11 @@ #ifndef AVDEVICE_DECKLINK_COMMON_C_H #define AVDEVICE_DECKLINK_COMMON_C_H +#include #include +#include "libavutil/log.h" + typedef enum DecklinkPtsSource { PTS_SRC_AUDIO = 1, PTS_SRC_VIDEO = 2, diff --git a/libavdevice/decklink_dec.h b/libavdevice/decklink_dec.h index fbfbe6280e..19757be45c 100644 --- a/libavdevice/decklink_dec.h +++ b/libavdevice/decklink_dec.h @@ -26,6 +26,8 @@ extern "C" { #endif +#include "libavformat/avformat.h" + int ff_decklink_read_header(AVFormatContext *avctx); int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt); int ff_decklink_read_close(AVFormatContext *avctx); diff --git a/libavdevice/decklink_enc.h b/libavdevice/decklink_enc.h index 39237673b4..5798f19dfd 100644 --- a/libavdevice/decklink_enc.h +++ b/libavdevice/decklink_enc.h @@ -26,6 +26,8 @@ extern "C" { #endif +#include "libavformat/avformat.h" + int ff_decklink_write_header(AVFormatContext *avctx); int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt); int ff_decklink_write_trailer(AVFormatContext *avctx); From patchwork Tue Feb 15 17:42:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34309 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp510388nkf; Tue, 15 Feb 2022 09:43:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJyojPZysGDbAsR+SUsVNcHOW36GSi+l2Kapf3hMKeViSAjTuXqSO/WmiI2lX+V4ALe91Dv1 X-Received: by 2002:a17:906:c154:: with SMTP id dp20mr179112ejc.184.1644947020013; Tue, 15 Feb 2022 09:43:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e2si8436567ejs.226.2022.02.15.09.43.39; Tue, 15 Feb 2022 09:43:39 -0800 (PST) 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=jQ+PQXoF; 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 C41DC68B1ED; Tue, 15 Feb 2022 19:43:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2028.outbound.protection.outlook.com [40.92.91.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E154768B133 for ; Tue, 15 Feb 2022 19:43:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PIX9Tt/y/xW0TL2Kb99K0Tc57eJtZAT2uEJIMtURSsSAxHWkhSpBrR23x16fwwfAjWAB2/mZhmSCnkzijWZUFV09p+yWTk+asvPB+4hXB8UMx/NdjvM+Q7wywTkGOBpla5tUjv8wGSMmKzq0o24vxhHncvtCJriOxKf9TepBtCgJ6zGPZn4CFvsaT4gwtkL20dj7iE0+9L/MvWgzrp/izLWtYsqH3FYNWSzB+vdaUjLbh9idatorFiQC8c+brlafY6FJ6ZyxCA4F3G1plevxRc1GUgP78OM1RWd/A5juDuZhNXtjwgcTv2xkibxRChe6wSs0GzdhlZ4zdtn/6iB9Kw== 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=JMoOQF0lbflh5/xt6caIgpirg7+QK3nDR0a6Km8oAWE=; b=CDqaYB3c1K3YcYGEjCfk1SMrKBr7eAErunhgKrytR0lRKuNzn31vlc2WJLQXQOwj+0PaDmC0VNPVjZlF+BkjL80kKtjdMFN13OUkE9AmA5bggx062U3/QjVWPE1YjnHpSoMBAt6nVoehyWmrsRDtZ3gLWuX4XytIorYIkFG4e8y/Px4GXFedL7orzHwhOJTNK27l5v5rQZEDBzvOmk56R3bPJTd0l80ObtKRR1jn46Kg2t/sSDnWHP4aJdgiQuklJt2QJuyaH6gemnB/sk+QpTn0ctWFQFDNyZhO36RCLpgBJ7tdHxegJG/x4Gj1a+RSyhuLWz7+wb3GDNlAZvb1wQ== 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=JMoOQF0lbflh5/xt6caIgpirg7+QK3nDR0a6Km8oAWE=; b=jQ+PQXoFo73dvTd/lF05FzgQf5DkYr+BkHjPIEO/TJqWX2Eiv/LKPIEnLNKSiNOk3DS2Kj4E5hDqqg8d/kZbxOoQj5v/6QzSF9PTci8xNwB7tqDy3SIM1pd1/DuLv/L8QUnP9NeyTEguTLQ5nwFqKLkeQMNejkHjsUI8VFqUFgaCq5rxMW4N6h11Ocs729791keGhQw0dYGyKFIO/tbx3uXvrBA74YSioUwEQLSA/Uth7uG6GtljYYe3kUNLq/lWIupxX+eY2LLb4/dKzZ6DXsW591MzUdH+QrzVcqtMtrZfMo8U1mh61a1YfwBlp0KPgzkZWo8v2+UoK/AY+5idLQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4359.eurprd03.prod.outlook.com (2603:10a6:20b:a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Tue, 15 Feb 2022 17:43:20 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:51 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [h0m+zbxXoCI8MvZOhOz5hpPa8m6st+F/] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7e9d5f5-f360-4aac-bec8-08d9f0aaa784 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlEkzL9M8WOuFroUWl5RMF994XHVv7YzYPzdICfIqLWqRyX6aFj4u843ljWjU35IjWm3Cuw5dshtRVJwHFpS9BPvsKdsAhNA495arWZgrMRAd+p8YSU0LgB37eG64dj6W75tyfV3/YXOMBDVH2TgyrJzjUWFPOHaGwXhVBXeOeBjyFUsSNJJmCLn43i49rKJmQnprh4BG16WAvQEgbkonHCaA1eeGIz76RobVZuwzvyey+qLmYlVUWuKkKHMxfH1lkcihrdfzNHTMTXgp6j3zWu535S3o4KuD2dt1y1MQmvImcQp9EoafzRG8/m/+/vhSnUJYcUMCCP9ZspENcqdkuOfEKNEhdrfObJHTnuU/h7fCpopmabgIfDX5tq69gUptjCfpuHZau99eRxL8apJyEFuKrbzY6qrNwp218WCBfRHKmZSMmRW1BJex2k7FfWk8sf03QecXkWradvpmSq6QKcuJoQOwpb71Nv75j9qLaD6gKoyTVW5pdiUk35SYuFwPBkWpgXY+pmiDpu2S58AiLd0Jz8gQ/j2KQA66OYNPRuEb8gcDHeYEUQwTfNusHzQXSUa7bvFC0qLAKOdsqeYy75H4HJ2zqawkJ1Gh+dGRw8JbpIqK0x4q2Fg3F/MeJwgXVSjcssY2+rR7WGj2Ud7zruSPo45uk0nxAMMFsVwALQJn0Jc6ngJbxBpSgYDuDTyVwcyX/ysXHnFJkBMovFaIu4DKPCIXZnkYe5sAhpZMwOVo= X-MS-TrafficTypeDiagnostic: AM6PR03MB4359:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gpRX2WIGLxMsAWSG/gsu5Sjd4EgQeH6+P/yAFIyJrAGlGf0lZDH1K6HpZqRB58yc0EcQebhbxgwMmXmVrt8mfwl/7B/eQjaHQscwLVchtvfN3jNYK+JbdglvMPAge1uHULkj9TSGBMqa2gppcdaHW0wjFbfF7+rOVG3U3hwGya/I4XYF1VaFXfVtc5jl3blP9V7+srvapcdgxephn9dsAizSwUqfcE09ruyki1Jfh5MUdqPCRZbLq1jiBOeN/FnNE/cW/Zu/lXCiWxnrxk1NP+yOEkph22rnUKH87Xk5GioXVROUyUyBttC7fdPOQmxQKSOn80Fq/+R7nIlXfcvr12mrQmX2iFGo42JZ6VgttVPF9hfHYsxZDj/CVBsJLEDvgNRLSqqInNdXkgaVFbxSz3CpaXZCoGSiuICJsUcXFMR3C9bh1kO1W3LgU1FRsZSElJ7zrpqcV0cDW/yhviAhSxNr9WlWiZsdcAalJnvYeQ4SkrgnOt7FpNLMrpF/hPljDfaf6xwlQ0VNKzMl8/CLlYAhmrWPtBQjQzLIXg82hpKd4evvUWlPiPFPsg2d76xw2vMCb3AwL2u+G1zQw6Mijw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lfbodfjr8pfxRUD2mHMoqwhdeiOY/b6Fd0qtN9j2ek5l4r2vwVPRvEx9U2gszqzoRgpPsfsEgehS2As7xpnIvQxjteIoMvqNy+vK/Y4+SK37VyzDloGRecHRZB2sUtjVYDNy0dJ+xgiYDwUlGBv3rYY3emnmlMkB1N/WOCyokOBOL0avigAXfsQvdBO1E+OY5Ee+TuQwtB58aOGLz/IBSK5c6A3P3BO0R18A9bruPCdjzf7C8rUZ3U7guByi3sqk2fAokLZOE/ImG2HUEMzluxYv6QSyRTvtE+dANM5PQmhi07D3Kf0lLsjAR3OzZlOfNEPVrLDHVZt6SmARmKPetOpZZ5L9D+0GvWgYn18rEQ7pwd3zw1xldxfaOuOFyBtucZfbnmwk/Y2DFfiSXakRQIkTVqeBpB172u2hz3I2iRqiXZ86WFl68Rt/LngZBq3gA9HXROJGoKMakMo8ZMC5sxXVn4jhGwxGFDt6mjJcnBbQTmgYpj6HgNbQ9i+1cfak5PXRng+wzt1hiHaHwHUMruoB4B1PyD3Mhjfp8GvupGh9j4QaSCLxhnP2LhiCO/FcQ+sq/Ul1r39r9h3rzdPIAuN4vU3TZUm1u5rcsSwySg0jpYnmypCvfpD8+vyf8PsI4m4GJbK0mpFZED8RmrSjx+mWQgGQSPKiwKFowh63kxeTvyA5SndEjHupNV+/HpEX5NvbZe8iLI2dA40DTgl/T67ivm4BWYMRjGoZcnt0OyUdMc/lMRqKamvuwrCVC4tybTtdn1nnok9Yk2R3aFlVvBBpgHlfKdy+8P6E4c3EwwRSvzZmSl7hBupbqYCrQktwCo+zmcJBmbr16qD3LgutZMnjnxfWRCk2SPGBsCnUGlEMtq0+2SZ5M1bk/Us5+gUlmMB1jeMcV7ZrA49kVK1xA/GZ5PqlxUm2xigEY4qPKpIwib7JeiKvi1tTUP2rCSjCDMRu2RD7pYaXCnpglL1VrA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7e9d5f5-f360-4aac-bec8-08d9f0aaa784 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:19.7267 (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: AM6PR03MB4359 Subject: [FFmpeg-devel] [PATCH 03/19] avcodec/cabac_functions: Add missing 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: 2go/P8x8kkAV Fixes make checkheaders on PPC, for which no arch-specific header exists that indirectly includes attributes.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/cabac_functions.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index 2f2d48a8f8..c3f08d3410 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -30,6 +30,8 @@ #include #include +#include "libavutil/attributes.h" +#include "libavutil/intmath.h" #include "cabac.h" #include "config.h" From patchwork Tue Feb 15 17:42:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34310 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp510554nkf; Tue, 15 Feb 2022 09:43:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyKHkCA60hfcaM8swSPj/CjB/1sWFx2VnstPQJBaLSrSnbDyfZ5QSGSSxGgZj2oQZHx5MPW X-Received: by 2002:a17:907:da6:: with SMTP id go38mr189088ejc.124.1644947031040; Tue, 15 Feb 2022 09:43:51 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id he31si2712222ejc.299.2022.02.15.09.43.50; Tue, 15 Feb 2022 09:43:51 -0800 (PST) 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=G8RLd4NN; 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 CF2A168B169; Tue, 15 Feb 2022 19:43:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB65868B133 for ; Tue, 15 Feb 2022 19:43:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mlZQt7dZpvvFdzDVE0w4YoUFhDR0RI2+AZJCc1vRFXgSaxDsOYWudKb3fKEE1aQpGdBG7asIVkXTt53WMuk03DLYaZqo7A21fy57+Lb5ltHZSQRHa5/wkMGXk8kwPF7L0oXbTJA/QWtfmDkhXU9y9MAtTcgQMjWxEq7HBiJvXpSX3hIbZB8zQXJusWAU6taG3UnHNWoQoxUqA+PhS5OnnJARJcNeOyysAClt9RqV5uEvJYMamc2BIJtBT8DE2r0AsEesdP54MGljmkdyKxueNkXZjoJZOnMrczk2fFyehu5662zDh+SThVgXMVdM5NCZG1d4b24/PIcOnDV4orK+qw== 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=+6k94sL8t3dLMx1KXHzBcIQEAfaO3k6YjMQg/bHNKe0=; b=SUy8H6WYsG6YhLVTHyx1UYhZXrellyUDUcM+koqABa4/mYbKwjltQcfJ8MB94m4tjMlmmgU6oanZ1eVONO0Zizu3wCsFNdKxTd9PN0Ve1RXPBCIRBSLtR+s02PtP0EZkXY+inyIvBpGUi20N5PzARBqUYqOVLnOOG7JVfUc9QNP1jtUjSW8GU7MiowXKE3jFLRuXFkGcQ1JPs9N3H+eWA91Whks6cAY1v66m9WUqhMEnmD6LJ8R46XbABBovZ9WhxrBqj4SsFdr/txtcgPce9Sxln6Vn7MmsGC70rUXtvIqcjurHGL2czXOzjIKasrH6YaOgv9/rGLpbxN5ZwU7ncQ== 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=+6k94sL8t3dLMx1KXHzBcIQEAfaO3k6YjMQg/bHNKe0=; b=G8RLd4NN/nWUS1IgVqeMl81K1L1KWeIhugRM/gKY6ydKu1LeTcer+Th7w/JLSs4Hk/0zU/pNfPRoZHY9JNPXLXqTtu/7xjvIxFMYalchIkDy11drzTp2gJEBJbvsFKIx0BCq0qZiVeZCuSPesUl8200Bp65hap6A/QInFt8ktv8VUZndKbOd9ich7/Pqg9Z8NmknbafjwAxUz9PKpXEE7IfPluWAy+9VOUCfRu2krhRauPB29WGQ5A5ZCW1slZ9bYKWzYapChNvYLUvQTGyxBMRRRoAChhRsV4t59/AjczJcZlpqT6FbYyLYzWZrOuSLV7sAkpG0dECK498R9gneYw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:21 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:52 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [WnKsQMuoHCo8cVkORwAX3AEQgSW6Oz9k] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4bd5829a-c52b-4468-d638-08d9f0aaa8a2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJlEiNrutKghn3Pgfiwdt2TWXRwAFhp9rGucnk1/y2lcIKIMlPXYPj5qiEODYevgja31aq//DPxgO8zrYlpd5yhyz1Q1UIyFK1nXaiM0n/ss0EMvznVKa5LnxYMIEFR1p2ElbISOy/bB2rBcAyJVR7Jk6BW0WlvCSSOtBk6wyFtrmiB2RSsQjd81GrUsvLDPd8MdU0TzTUyR2769OI+gSM0LFH5Lczm8tKHVXYyGTNMF9fcM1GLznZRfuVLfJ5TOqeRqRt7diGOb/LsF3v9GUajhs/bAPwJUoEYFPzzwxAYQThule07/BFURL+3yZlmjOIFeHs2/im5mxdY2kRjMgbYwi5CznL6dkOxAO4yBfnCy45OCfbp1SCFRW96WJUF66h/q2T/HxKUORsdE9g0enrGuPL9pmZYYbn5MPbdu3IHkO7n1Ht+7Kf4RpaR/EoYPEGfc6iJxVzwP5Ef9coiGdf6nhtvGXx+FW/JZPCw2iExhMaOlniVqo5wMtmpKxQMFGuo2EcOJIcAH1E5o1Hga0njMl+hv5fJ2NzJllfAc6uxT7fk/cTkx1i6kNQzlD+6pmedNvw2MMEMHDqGy5VEyefT9vO75S09+Wkgow2CoYA52PDuaghG9iyseaJ6fpDehSKGWbZMD21nZ5+sn7bWOfk8dLLXoR9IMd0HEguIex/lwoUmqnQov81CVAD90uq2vZHF1DVSR/yKSg== X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eJ2ooWPQqmX3PwJR8epDhT6zk5H3HOFb6ZigkTDiPIGIP+5knwEEJLiVRzaeApwFAfhN4WqM5V3qM/QqUxZMnuJWjMDm1ElXIA5FdUkst0VuRENeCskhmZwMmQxgvMPehs3X1RPx6SD15llroSCPVaMBgrwaWGEkTfQpqR8IKmqfQMrOKGiUCgfyCjUBkGL7UrPPg8Uj/PcPvAoixrSW0jSMznCcdm9XLVTqcHZpUerquEQ4+eNUHW309zWOls2LwNUkbh60BG3k+LnS9DhoVifqYBuBV9bKvK5QdMYBHIRULznFMimr42jxHY+7A+T7Zu+YYxUaqsXbNXTjSikuedg28c+wMICxg6w+eDnmwSimAmzWQ2jm24yqxn4nUDgCYoomlMF2CTVY76DwK1/TtHAD7pWDxGjCr04XAehkFZpqhJeYXtGVNeFXX9GbbapKJMMy7xLbYQ+iRw1OaDwIZzik01eIBeJcA09AyJ8d1BsNWdb2qZwmdMLEZVid+57+HKSEE4D3qyu2i8IuozoVa+N8mfA2UH3wK1Ey4ljggFZGkfrVEfEkoPp3/LUSD65B6q8ORBSshLHKYkbJZV1K9Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ru/jm+Cx6KdsGeh2tnWpXzWX3cE/qrGHjw9HPgI5UhzIYXID1F7+rJgUMwxZ4swDhNgrRgH0rsMOAOcvVW2MBuNF8QpkwhrhaCL9XqCQ6VUnZ4oUiQe2VLC3L287qtTH/44kMArq/CvPMHHw5YeZP28bUjgGgxqt/A9F7P7or1nsQBHM65oY+Wlu3otpFC9Nhn5p2DxuJGeUiqjzNOv522PLHaBo/7QSdYGDjDqI9tCAg/U1+V0sUR2K9suLCexC1ddBkx3sMXXwUriO8TK4hmbVS9z67nn2CSvXt9oVpB7DvqUjx/vCioSFBR9wLbnPY48qXHWhQnN4lN+ufgKrzOBz+1QCwQ9Duw4f7QTu70NOIVbKMSBUSwfEyumCPyv8zC3C2PyEHge7o1QO49s8Vv+J3+z/WVGqlzTO0dRSee6z7G7fzqVTjZwAUyeLR0c2SvbEU1diUI8tzuR7m2Ro6QrOowHY8s6CLEqTUyjyziF1g8WnpJV9MiscQjZOlWcof3iDnbFUtvklza9lSSP+6mlqVuF3ducy1OSebEJ9BXTMwxuYsC/+Opx6n10ZXs2coPceDHcDv8a4P3kniW+gbCs1dB8VRKBNK3KqQ7RDfAGKjJiMTh7lblFL+OU/F7SuouNweQWp21O0NzXPIR/bYguSTEfie0rcihSdOn9ANVWII2runjGrJvCKcRxaQ1FLgal+wHvhrO1EX3NPajaWxeFWiOa5stPqcTTjw2Gfye1AzeVWl0iMffjirsg/n1V9fWbc+2Gsb43PmfowT7bD9ye/HXXK0pmQtW4SyV8O/9C2H14j6FtPZpf90m90xBGMUfKXmxxHEpzDoX0cAjLuswJYNVX7YT/hzwygqJ0dQJou1/qsXsmHIdiW6H6DxJEyeY6jiJKl6mz13iqk5rmYvb6tz/zSG83Ool2yCvdNsUsDC0DUfVXLRTwA4mudFvDs4Zjv0ZHA22QQkqADSsQiJA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4bd5829a-c52b-4468-d638-08d9f0aaa8a2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:21.6798 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 04/19] avcodec/aarch64/idct: Add missing stddef 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: oyB8/pj8lgPI Fixes checkheaders on aarch64. Signed-off-by: Andreas Rheinhardt --- libavcodec/aarch64/idct.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/aarch64/idct.h b/libavcodec/aarch64/idct.h index 5c49046148..97ee0a64af 100644 --- a/libavcodec/aarch64/idct.h +++ b/libavcodec/aarch64/idct.h @@ -19,6 +19,7 @@ #ifndef AVCODEC_AARCH64_IDCT_H #define AVCODEC_AARCH64_IDCT_H +#include #include void ff_simple_idct_neon(int16_t *data); From patchwork Tue Feb 15 17:42:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34311 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp510701nkf; Tue, 15 Feb 2022 09:44:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwM4EY/Z3eL5FSdJmLOXP5gRW5BACwjC89f+UdJx9FRN0pn/XUUCnnat64WPGRfzwIc/kEE X-Received: by 2002:a05:6402:2050:: with SMTP id bc16mr5093571edb.431.1644947041460; Tue, 15 Feb 2022 09:44:01 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s3si15957392ejn.305.2022.02.15.09.44.00; Tue, 15 Feb 2022 09:44:01 -0800 (PST) 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=hyTYKASJ; 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 E3C5A68B234; Tue, 15 Feb 2022 19:43:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25EEE68B133 for ; Tue, 15 Feb 2022 19:43:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c+CeQ2Wjxn68FO0lGrCYrdnw/g6AO0TtTq+2USz6LnwuWhBD/ccvJzQTrMTzNFkc5hUFn++Oggs9wSZfBp7NXebxaYV0KRysoJJCol/ai9F9N5L7Nt23Tf7edww+sdAiXuqtB1Gv2KdJsILp/fHz/SHj91the6O9Cosx23lXQIcinOTlGMXQd7xRk1CJrOo4zfbubo9LoZcTDej6QdQ3nBU3Mw5oTTvLEl/PiwoAh1xHZchCiwyOwXQezm7l0XrwPLEMpmwHiG2txz020vhH9psT95eFvd+CVCx6XzpeaBFtxiJFpU7Jw2NzOo5u0QYfMU/SQm9sETcxivt09jJlqQ== 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=6ErgPR+Y3Bsu6wR8NlM3sayw0Ru5zYXVmKqwDFYiZpg=; b=U2OG1POAi5eRg4fXgVt0cVGkspToWn09eL7RjElfMUxhh6YlxW1v34qGbQajis/pi4aEI9yip1RBcMXGiC0QbeYoAA/WIY+WspTy+H7FYIsi8dbqQzjCiDEK/2vRFpSPeaqTB3FP2d8ANvmL6JWR6OIvEHdcOh35589xgsihpLRTWMOTrXxqeySUHLQ/bc7fUlUEjxzBVsADn1C6Gk7PNX7yM+L0FQSDUl34DL3gO4Dfe7NxYs4OLZ8IeofTmW6ylIo5zdN2hn3SXlrWtpD9ESYHdTHH8EQhBF2c5/amORcMIXrllDtgELl/YXLFNi3Alxqs9hvdcigzqbS29DuUhQ== 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=6ErgPR+Y3Bsu6wR8NlM3sayw0Ru5zYXVmKqwDFYiZpg=; b=hyTYKASJIdIOTi8eDknPcssOR+GdjktNgdBRQyRfow3r2CYGPeOZd4u87KNnEOUl95yqidhIqUv6lQeOQEHJ2frFMD47nhxX79lJ8ucNTHObjvIfuq6PuuVlzjq7huAx2Zxks4kKuWixwlcMbi3zMDMzpB2rhkYkzmmw2vAmj6R99lS3VdtJeRuWSRM0rWAcPcKaSEpYVF/iJZiUALQVB+QZQssO1amJ635L0/TBg8uhJvwwIHX1IKS2crXA5E7mZkpJ7ScwCurj/6u6Hj1WbR0JVbK6lmpXUJxLwkQPPFz+lI0pcqKgyjtnknTjVdgNgsiTFyE9A1xccecYY2Kvsg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:26 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:53 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [hUgQcJKtnv4PaTtWszb2Vpo59dN8dDIt] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7517f752-cb81-4bf7-cbea-08d9f0aaabc1 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJlEiNrutKghn3Pgfiwdt2TnsNz5sZNt2HAIpaXiPjYxx7w49JzvFq4BY6hW/V58ntfumfu+bqD7pKwFPoaWmKKcs2FycRRo2aUW4I++jP2c5vK2vYuNB9kP1JBLavQjP2NceHRbUY1JPbU3UZB51q1xKa26ugHa717Uuf2Cz3zHXPpDr/bJkaxTX8nF6rv7O2ySna0D6LH1BRKPLRpX3kbrbKdCg6mvFJkqyn4iRDmfLQlPo+0MzLHsNNKVpM+aHAD4gtLMU0idnLBNBBorCW9qfpH0N0+g6q2Ws6LyUHsemaxDwUTeFDXFn7xp99dMQtEzarMq29gYi8eBQt/shVYWZ2x9ecdMSQFjoTI2AXC5DU3xRuHo45ovQll5CU155JeEgmLx3qahfL+CWGDD31nF0qBBKi80t5zbLP3OQ59qe2Yzmez0BXVbVPH0qC4YEwXqPRO3bLtiE8wsNVLOUbqOjPrNftJrjiEYnndpy8uiyLV2SrxFVsrZnfvVo+OBdckb+76hiAUY54EaoL+UHY1MHx5qZCHhYpM8EKqP6Cw4n/mQF6DIn6L6k8abXV2T1KRU5AC1YdZ6/bp1lCBic8T2hp3BmEFQ+KIqNlUqGJ6nXkoAtIjjyKklo3M7TMWuHUMT4miHa199J95WXh2Xaw+2CscS2ENiP14JWuTp+lEkt/yfjEr/ef9hcDuTAZzK0Vx+ubzmpDZmA== X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ntc+10GthKOaYoG8Tv4DO0JyQbsvEWAX/rAG7o6R1OjtKdgiq8hcg6kmJXVNPeiT93Pn4+N8O7B5zjud3G1JFpfnX/uJyPSo5aMkep+qdu03iJqqXv8gGoj3XNfGoCkknIEM7gsXIMT9OuRC/VJw9H+bJZCO0uC9C81vidNjE+oK5xDg8grKR27HDyeeHgnZ2vQKGGUHixUs96C6ohOFTGVwqF8BNcGMTR7PuXkXgBiOcUvbuGMLKGoRhYHCd6HqqPdNqR8vqppFKQUMA5/vgsXd5cQglqnxqUTfjQiYKa0mkZiD1MLytS3VFgXQNIHDcQQ/K3v+Yze++aHLqfzGjg1DtSX3pUBaIq547Rb2lba7A6fAs++2g8oqAYkpUrTLjOjVGFw1YRJxT5G5+sfR9JUeW+PYropUilaZqq95e+dB3vZFiVE1wE+Z3ck+Xj5rDjRoQHHJKlTt9ay9Veo45JrdIFjY6rpOT/utvb+H2oUltDOvfVeAH9MREEmHqRliRNgfmVk84ymuSryM59ylFyIf3EfqQUTZpOR/EJzfpEqOmMUjibCC68cZNw7JJ7Y+3guL+a4pgW7XomOMG5X6DA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9Dq653/O5agBk6Km9qRFbC9odXy/bN1nJDSb+A92rCmGWQu8FI85/mRdWUgZgxEJJygy7r0RGkJR9McmjxXv6oRyp/knjt9Z4e9uVU9yMP1YiSiiKlYY5GZaamDDJn1zCzMiN4Fcfda3hGoga+FtaDlC6/rrL/5TIZl/LDWamfXqngdTVAfKObhj5EmHFwfUVQ6XwV/6S6TaqXyJGc4++JA3ovx+ro5xVREGL87luKs4jR00c6DoWjk86tBIRFNkTQIv1q3DkaqrgBPp4+oDYsgtTMpPPfitEef6MghF3/kQpHruaYQI4GmoJhcLigM5dCT4z99q2UNRdBR40PiQc2hUh0Bl5mUTYmgeZDxFmiz0c83hil/yaIFK5pfCuDUxaMChYDUr64y/XOLb3Xyd1bEPiemZkZLvVYzxwuTy8y+p7rhJeRAJPhXxUpGz9wXbxmuldhuifelHJP/GcZ49tY0/hd3BsJuB6LKaV9WaYFzpZRSnxNSsXvdDwD7bIK7TJSbX+Y/9X4wx6OePmG9+EIHa1nxSr6ZBB33V6qVy0ru8+PH00n51b6xoHGrlwu8FOyRNgJAiXrYwmIx78XYYEYOkHb6e2R4hTxGHacqp7u/7WP37eCl2KQnJH9NfcjmaieTWkBEP22jN3K9aDDgJ1mx2F7AoHjcMKzoG1Qjx4/duchRIKgr/dsO9O3X2tsAHoTgzCs1OgwBH6IAFqP6chtr+WsffcRtpT9MO5PZJYh/8noRBjCeLffalflQgwxbYF1VNvRJzGghHBn5CpR6FhaCXrPE1iUZHoKZ4YG35/z9v3h6IJzh5MuYUUhnMjqOkvuDx072ylTFMCx0do437k+3os8JZRGWG1HbOBnebSy/AFi3Lf/lE6iovgh8hJfH7kRi2RjMSJb3s2qBUag73ZuwOdc7IZZQk27xEPiv1Na7rDv0PSz/YHKIYYODBbHkqBZkyDlIsCUeY7bV6HPCn+Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7517f752-cb81-4bf7-cbea-08d9f0aaabc1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:26.8065 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 05/19] avcodec/mips: Fix checkheaders 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: HVznMrol+jw2 mips has several headers that are only meant for inclusion in another non-arch specific file; they do not even try to be standalone. So don't test them in checkheaders. Also fix vp9dsp_mips.h, an ordinary header missing some includes. Signed-off-by: Andreas Rheinhardt --- libavcodec/mips/Makefile | 4 ++++ libavcodec/mips/lsp_mips.h | 2 ++ libavcodec/mips/vp9dsp_mips.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile index 81a73a4d0e..05ed63bf3e 100644 --- a/libavcodec/mips/Makefile +++ b/libavcodec/mips/Makefile @@ -1,3 +1,7 @@ +ARCH_HEADERS = aacsbr_mips.h aacpsy_mips.h \ + cabac.h compute_antialias_fixed.h \ + compute_antialias_float.h \ + MIPSFPU-OBJS-$(CONFIG_AMRNB_DECODER) += mips/acelp_filters_mips.o \ mips/celp_filters_mips.o \ mips/celp_math_mips.o \ diff --git a/libavcodec/mips/lsp_mips.h b/libavcodec/mips/lsp_mips.h index 23b2b6bfda..c69f8b770c 100644 --- a/libavcodec/mips/lsp_mips.h +++ b/libavcodec/mips/lsp_mips.h @@ -54,6 +54,8 @@ #ifndef AVCODEC_MIPS_LSP_MIPS_H #define AVCODEC_MIPS_LSP_MIPS_H +#include "config.h" + #if HAVE_MIPSFPU && HAVE_INLINE_ASM #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 #include "libavutil/attributes.h" diff --git a/libavcodec/mips/vp9dsp_mips.h b/libavcodec/mips/vp9dsp_mips.h index 0b6ce7cd7d..021ae9e59d 100644 --- a/libavcodec/mips/vp9dsp_mips.h +++ b/libavcodec/mips/vp9dsp_mips.h @@ -21,6 +21,9 @@ #ifndef AVCODEC_MIPS_VP9DSP_MIPS_H #define AVCODEC_MIPS_VP9DSP_MIPS_H +#include +#include + #define VP9_8TAP_MIPS_MSA_FUNC(SIZE, type, type_idx) \ void ff_put_8tap_##type##_##SIZE##h_msa(uint8_t *dst, ptrdiff_t dststride, \ const uint8_t *src, \ From patchwork Tue Feb 15 17:42:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34314 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp510865nkf; Tue, 15 Feb 2022 09:44:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzc3Grgs6SHyBnD5gTeamR3upmLln9hqlqMOq66G2QmQYpXXDIZ8nC2zAczmQ0R9UfkIEKS X-Received: by 2002:a05:6402:3489:: with SMTP id v9mr6598edc.249.1644947053204; Tue, 15 Feb 2022 09:44:13 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cr19si11753169ejc.767.2022.02.15.09.44.12; Tue, 15 Feb 2022 09:44:13 -0800 (PST) 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=KOoTsXcF; 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 E1CBD68B26E; Tue, 15 Feb 2022 19:43:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2104.outbound.protection.outlook.com [40.92.91.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1ED5768B1C0 for ; Tue, 15 Feb 2022 19:43:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qrtg603MgJmygyRrBXWi7zh8T8xA6dWfiwjO/srwaOBegiycmzx+UNuBBbRtlBkkKX6Z9qTHh5k7S2O/U2+aIbIJf3cUjXTOAC4iS970Hzi0bxx1g4+JFn7bYzk32cfd3kxiffTt3h9a6klX2czhyIK/1sRGREG865TF1FO8VwGynaNaYIb8tiojYx3np7l7954rSAMecdEDS8hRltHfLwvRijqvc/8mGDDGel4M7JdC4q6+Hm/XtpFYtozfsLzSIS/rbDEyI42ogHp3zFbu/dCo+8Nm5D2d03ydJ8wthJK+9lCfZz8RakJhtCnt5tjx4BsVBAfWgW44l3F9KBfYFA== 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=hdMytd4INaW0EMmOzd3MYOJa1f27KfnUE2XnsRT5D3M=; b=PaF5QzHkC75ITZi3uxkKwerVEV5VG/5u1ityCfsqi5sHTbcPXuk1cKTJ47ia0HjCJxnaLuHRvvreMas4jn4BszwTvHR95FaPtsjelj5hZ/pOWLrPXAnBnnPOl0VYC8yFbAnA66o/89kS4yYyEbTXvD+m0fr0mIwPPwh26K7fQyj84CMToVQcNtiQvIChGRRJMtTZu+IPtFlFhdNLVpbBk8MN+CFY14znQ8nCRg3+FGY+zYZrmG1OuLZji/JrN0vlH2RHBQIre2SZS32Mt/MGCfR/Iv/CI00CL4C07gt/1pMdPRQHQxHsYrHqzamlmHqSSYcoSogN9c9aUddGYWiA8w== 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=hdMytd4INaW0EMmOzd3MYOJa1f27KfnUE2XnsRT5D3M=; b=KOoTsXcF8C2SR1BtAwWBQ6Roc9sZ4QZ8fq8SUtVGTyhO0RLR3qRQQ9TuGnZydK2faNChImAmNEBxZgqmKCokJfb7vFounsdQPnmbwf0XNEqRgqtkp7q7qxkk/glvzCe110wfqSFxzGnkiP/Q5jSpi5UCtqeCD7GXP5xBqeAsjaF1OVBXUA+gCgu2R3lMmWFbhy+3vPAZqVvpZWRvVNZrPxnx16EMeYNAPWQ/5liDOVwX/POC67OHXWgjrfwSCdd2U7JF8xf2JUU3dTBIBnv9hnO/H7FiBTuv3kclGKThsnMg5ik6d+9kxbM/buLFI789uR4AkKcKWq8PDEBK0N9F5w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4359.eurprd03.prod.outlook.com (2603:10a6:20b:a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Tue, 15 Feb 2022 17:43:28 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:54 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [p+eWwGL9PR7hzcH1ig/Gb+Q7C0y+wkwe] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e05abffc-6f43-4f25-be1e-08d9f0aaac5c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlEeE76wogwhEvrLK+I6VFqdzLw59bgtchP8UMBko4zXn/ErX7YVyWtYAIBXbIWkuoq4m0dnRrIGnZ3ctNPce81lkWrSJrukHL5/JDBO5uUzpsO83L2yBmUz/IwHYP5XqMhQgrvaq+QOYr/sqV4k1sSjagn8CKKbUYxPCwmMwI/ijSfLDcea2v4eHTaS3jgpCDrpYBqmWnmOKKF3YtRd0yNk0hZl6V9zQPYSue0USQ3S5Q7a3cgsU+LKyTS+EaVc+K/0AWDr8olt4bY65YpeSuh9EnAHLf0ArsVNtBa0NW1H4+FHmdhiM4pkpbmKcUn/D3d/XOqIcH/GEpPOvbzfWTTWXR+hi7XGXCO737dk6H5jWd0cpGqeSLPx2wAiBvie6Y66w1Id68VPHK79gWvJzE/F0VhAOst9cLNfAlN9KZpKza1DaTE77FTCpoYiIkPyP0V3dC2URwlFoLxdMxOEePNX+fcbAatAJzwoMMv/P5vOKqu5FpjavpdxrI/KgrcrgUGd9K1v3NbudbJ4z2XAaVa6zvP0UTIjjqHwhxRVJRnsmj4xzPhjBOkDS5hzZK933worPWcsdPvf9AKSkT/E8cRI2nm0LksTKTwH3KVwEDb7IVWRxXVSZ4ZtYGx1aZgU9hcPUElV8MycgeY1yLbdKbfe8+vXnIO0f8r/4c7F+171MJqodRRTyNNST6yofK5MhZg9HVtqr/C8T+qa1x5KeAw0e9Lv+wAjyNoqWYQwvD8AM= X-MS-TrafficTypeDiagnostic: AM6PR03MB4359:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GVBlw7xmFjCU0qFoDFZm+tnUCmOzwQgLg6YtetC8NJZ4EEvJJrj62unoFH74//iwEiaM5fQxTA9JFPke1mD9/BTNmc/oNlB7O8OkqDoLt0VPXHxv1zPKVcq9TWAjQea7/TDi73Qn2qMvx7zfA/3e8Inb+yYlsk+OAPnTP2okEAhs+SQtziB1YoXQTUYc8711g1nbiI3jmUrD5jUu0h58+FPFJwh4qjq5X/SoSoyMVMA3lGN4E+vn+Q6+u//ikPxwlQR58nPRDXam+Mg9TPbjWsB/tPbiQaat2P4ODJ9ibKM8KQXNOLn7TTaqIlqDFuNzEg8UUsV+3TrI18Yo/vmpK5zHmShW1/Rrb4Reo2xyMHtKgm/JEDd/V4YZL+GDdM7u+eUBHzlB1hioUGoCFnWik32P0TuVmqpxC8CSNwYdXBXXqAm1bm5xjHB5bH4rUw4f2JGiCo7Ii8DdOJ0Fy2b8DQn6GBgovqwTFMImFv7teTmpaB81fOQyvwkGYa2UxiE3/QPgzIGXDKn172tmI0F/T4Ycybtdm90FpOvR60GeAuEQUrspV+ZL5nHMsjYBtZWvygMsLxPh2VtdFAWVsn+TiQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3Vph+GIU87yQc39NHC0dy8XZeXgLKU1itcINmwukPGWuaMHMIBt000SaxZ2QgVwQPkZjLNetdX/L39Cu8520QjVuC61iZTCvCaKSTeZxnwsotrgNdWF9KA5iD70kOpEBhk/0uoYdVarU2frGfM67KZ7uzt2zmeEz45b+qAAOtAY422AZgPeUCG8xo9VCbdqB2i3INEK4gu0nu0YYOSJgGICI4VS3xIb9rV9r4v4LPP+bCImQnrXiXXVambZmTZKAajBAkYRXbTP/mz9PW8cL7SoyF41kze8OJekIInCDdfSkMnsp/CIHvw+HGWyaECSGvbmOzzRVGCvVHYKOzsnO/Pe/JSqneNdnk3zYrEsV1qyw8f89cNZvpX3jBFec/NLGLPWfCTkJqONkWItxK1yv0aGsoxBG7MxidaEzCCYofPhQfQBBykjpzRxSMPCZ/+NhH397MzFNrn6BbBqV7J5nkbPEbozvckZ9KGdHMm3+SpKr14ohi/f7l5/PbEAB4+m6i/wXVQeKhDx96bfr73TF7CVvwWtFyJhG+OH2HsFv0GDv6cGdCilhP0cPmNpJIktSZiH7WYE2gKWDt5eGKQGb6nEPw/D3odddELKGkt/tgF4yTtet6xfpwB7Vlob2ZPCq5IFiRTFRLhDBqeZcD1nza75QnJXPVbqiXwT9K1Z6ZaCSnGYjczSve1z9XyF9kFCDcFaOJEM3oBpfrHnxG/3vG/Lhi4F0nFtkMsHm4KYCPJn+IQPGUNaLAQbC4nxg4Bb77IohyMcFwIKkQdBdJmYZ1hvfULLEW1Qq4oZuRT6e3ee2UAyjJEqn/F6u1VvWvU5llbdWzk28fXRP86i/AXXFVb3N0M8T56fWBt5utISIpuWrQIybU2f11UXLypeGhEu4GIMpHnxdS7NQ4LKsHwk2hmzhrbTFeeLCA/kR57qoOcgaaviaMtQPwXP20D3ntD+yOxHR3zqlaaiHcKEe9/h2qg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e05abffc-6f43-4f25-be1e-08d9f0aaac5c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:28.1357 (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: AM6PR03MB4359 Subject: [FFmpeg-devel] [PATCH 06/19] avformat/avio: Don't include common.h 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: gzhEzq5nfsvN Signed-off-by: Andreas Rheinhardt --- libavformat/avio.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/avio.h b/libavformat/avio.h index cd63322a62..ca970b1ce3 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -27,8 +27,9 @@ */ #include +#include -#include "libavutil/common.h" +#include "libavutil/attributes.h" #include "libavutil/dict.h" #include "libavutil/log.h" From patchwork Tue Feb 15 17:42:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34315 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp511003nkf; Tue, 15 Feb 2022 09:44:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxf/qb/fSOnJf3JANFmppCxFdTQXLUxkDjX0MqmtnUUfxrvLBucUVJvvEqRkQ7z6sNPe9Dv X-Received: by 2002:a50:ec0f:: with SMTP id g15mr58662edr.122.1644947063243; Tue, 15 Feb 2022 09:44:23 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a16si299795eds.228.2022.02.15.09.44.22; Tue, 15 Feb 2022 09:44:23 -0800 (PST) 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=NTAPHQq5; 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 E61F568B249; Tue, 15 Feb 2022 19:43:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5187768B233 for ; Tue, 15 Feb 2022 19:43:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TC8Uat37aKF3HXwjLkVcrlKqR1+o6mXJymApuveWPb8b4tewRI5cyuslzleLTBPEElyg5/kgC9aI9DgvoA6yeLY2mvbnKOM17sNvFyvu2tRJAPFTaahhCecjDFK75XaVRljiZdQDfcVSrw3dzpZezXG1xvMY7uVkTxj2j+Hfw2ZeFhcZwVa+NWvhZpgqFWvu+7h30u65nSgC57uaV0yd5rlSOwAIC4sma1rLNx896f4xKjSoCzW5QfLyTyZuBJDtDmzsNFH4eSVcb54Jql/2CFacIIH8cV3UpjyFSwQbZpwsjQOXaaXHm4+/MBgNBIVS5L5ARKf+dGDsZIYgUBXq7Q== 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=y/RngW0xRL/Gz8PVYb9SsjrNv5QVh9FL7TOP6saiP+I=; b=eiwL9WZgC2f+b5m/L5h4FlVY2c2oXcwcw3thsIRe0irhd6BH/572v5X/fHN8twTcaYdHKWNg1LDljnLCxtKMwN89g2QA+kjxaRkheuoeGJb2PJ+Ig68lbRkLrTteI6vfV2McfTyiRSZyMc0HtKB2YAfl2LfVoBTciV56rmGGBqxeWw4snI2PRw4FuuMxDTLnlEajNcjOswrvuOS3s73wyHr3B/Cyz+RSCY8cHj15cmkHsnb0BfIbVVoEMP3pouskth1upReY/uEt/mzCjdOKHAZTNipEm0DjspmLnllj6YC+9GdVT1KqpFQV3+zCnO5gN2ElP9fnc0917sKkFjRAEA== 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=y/RngW0xRL/Gz8PVYb9SsjrNv5QVh9FL7TOP6saiP+I=; b=NTAPHQq5+7U2hJzpa1lpKKtDk9hBEJJ2dF1a/VZ+78Fp6+Zfwe6e+MSVBMdIk06viIFWCFTOrRUeti0X5miBFw+Hqx7U9WmfzDV7oBF/ikChM3vX/wAaXWUp51Pcv4Ly21go8mU6Xxnoa24ogiVGPc+8woQFKlpexS3O5v5XTqJqntDpquUcndvjMs0IJPODhdiM9ps1E4xBYGj7u1/MPgOiwokxW25lfrPWrB+K6mWL1Vx82ak15PksS9SIQL6rwYreyHqjt3B95YeLUlj5wJ26JH8AbWcgFarl0YltSyiqjpTxJLdkpUXrLYqDd/ran+DqXhEHZqwd8/P4+wHzlw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:29 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:55 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [z5GccG0jaguLIA4nqwDm6zrZUmOY9QWQ] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 325d3452-69f2-4011-0868-08d9f0aaad1e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlsJQbrZIrQmyE6EY03TFvlqCnTjtKBZpHjseH4eWAkFZvTTWMzxi9Y3EGSZTnhCYcGUfHSQ7WnsT5DkStnyHfZZ5bHSrJVVNjhirXFYzwgisW2Y7Yng6h4gOeIP8/IJ3Fpz5I++/6UYmYz6DK6eE5rcBdNaUym/7bSdnbhyS73NOL9k5s0aRyl/kQeGpwWau+bpc24b8Jm0EtsBbNJuraJCA0Y/bxmuH6ux0haU1SUcXB2VMaSDf6bAMftTAln9v22alUnDaId+c4hyepQXJTKmP0vVeHTU24JPAUsTrROxTEK9gVzgvFdzR8EEYpTe2wBaiXNMGCiRGNXK5t0M/n4LuTeEbkEeQvXVpB5f4+rruQ0l9UjKFCrQhTrcJx2tQ5vWLT3LoTDkk8MhIx12e/gIY5QCnpfIMm5EIIoO5zMnlQwoSb6CZRYBw/M3rwaa8RFCJvYXwrDu82X14mQYe7ewXHsN7ZPQPEANBP4iHb4rZCzveazARhY/mVPUmYalpokLzSD+mXDvbwapUhKUFpuQjqT67Fwr4snG41oZS61/EUOBgHvfVOilW26KlV+NEh57YUlOVqlEDKoE+ZamDVfoDT1yQKR3AoPf1SLYFhNKeDoMsQbEn4xb70X3ZsYw+3C/F2+Vi83cOneAm+/OKYt/wMZDd4w84Nedin/B/5ub4w0YobSMYw9uEZga1R27d6UdGvCIspGQVwNDkQ1gfMiccJch82Tpfz1kABHl8TQ/o= X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cf5I14mBD/kNAFgBhynabOGfS42Jl4Ceu8CN/pXQ/Mbp5zXQ2/AyDQGsfqd/PEMPAtZSopxAXA5d2MBEG8vJ0/cpB/qAiKGmUGmRtVWMM2CbeVMzh3DL4Qp6t+jQApInGQMzUzslZlc6qnLwMhYVR0HbeO8ZmCK+iSf6EsS18pSzlXPLKFajl4ECbhoHikEFx3eK2hnOi3t+4bU9X/OgYUwh3bEwGrLA2HddB2ObFYS65yvsRs+hFHUCevbQXzJ45HeuYoTO8wl/EpSQ/xeIzQfiZ1QX2iOqEdYAZsGBRzwgymZ54HNIkMJFho3qMIX24BVTT2NI6b8mtJLXS/2Xy1z0mbKE1X/lFnRzUWGQjX+6QOc2zRm2Z7k/VHHhe8GkdbwYECLg95LYafUAEkhi7j4NuaPWIyo1KQodkZzDzjYbT5GFwpMEPsvgNds6eZiIF8lHmVNJW23sZKHWeWo3wHplommPnapH+/hjLRiW4n+uc/mgiTDMEiuvsKxUGni7g5aSHY0z4AcO5ctqzVEtxPuZsc+QR3acOjuLJdna8EyEb/Yj9Sq2e/f8wGSmVXt/Kpr9Ufm0++jHjg83oET3fA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 06wXx/uC7hwAtRw0e7NCKTs0MFMuBZNRY3DPnWmJzNlYynp/M2mb2bX2sFik2W3BMQD01QoMxfx3FFr0O66ZtQETjhY/Pekk9wuBGIPce478oWt/mScNPz11d6i2NNRFeBxHb9MRVj+wiy2Gy+ArMkLjf/ZI/ZqdurFru4UTBxaB62rCtqADhhq0ykwcUYacXq8gMm7WDonlMFFKjuETitCZ6dBJbG3cFr+/QRumhhsWU7EzRUjlSq9KsYmDLaQ+u8OPkTv226KhbsN8pbz77d+vGE+eZdk71mZUndBH8pkvMW3YDlIeUE9BdNgd76Gfk2em6FxQ7sinPisFiDNyn667021UrmHIJHCay8EA0MHfLCzQ92bRAVg+LSAuxXun0zLsvrJx8jSQCF6f3nIzVAPyyMQBy2IEnvMAIgHOvnzfPKO8G2j2YdpGDgSOzBrAf1nY/mAjnxvx0w6hyGBjAvJApZBpNrQyS8R+lCcbbF1wn54zDxvWLAnDbXxqd1jSdKADf0n+QQvyvJi/liY4DDpnlOY8MbIciAdSW38PgmV+SxrcRdhARAbZczSHH5cgg3F2LPfjIuJDs1nbg+/wwviWeJmOE04v0B7OO7DcceanyEVb3uC4IKcygEoP0/HUDcREitB+3qK03DxTWFT7+H6gtJ26TbFglr8WBqxF9BcEZeBykmcC3VqZWdEEnu+jW+GCKGV5dh+yqqENEuDfzMsUkypJJLaE3H/rTGKoVza0J94wnUEzzj2vTtYJqHWs1cgt+rx8wKmoKqvZqKaxek582uYzJ+pFEy2WL7obH7UI++F3i8U6UIVm+9zHy2QXRvyyrkhVLJXYU2WEQX0Q3TFOq1ZiOkRD7W0Sk2RKwfwO1RFK8x9OJrsRtHG3MlyRbGq6OaSQz8cEy7g8/StBuSBWaY5iz6TVb4MbXH+3hRsPtQjS7QcwmdINZG9+CBt5ykQxX9VP5+l5gr9QoRNnvQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 325d3452-69f2-4011-0868-08d9f0aaad1e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:29.1356 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 07/19] avutil/log: Don't include avutil.h 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: 1CBC9H+aYsJ0 It has been included since af5f434f8c0fb3b4ee3b206ebc1946ca660a8abe for deprecation reasons, but removing it has been forgotten after it had served is purpose. So remove it. For convenience, include version.h instead as LIBAVUTIL_VERSION_INT is supposed to be used when creating AVClasses. Signed-off-by: Andreas Rheinhardt --- libavcodec/ffjni.c | 1 + libavcodec/libopenh264.c | 1 + libavformat/avc.h | 1 + libavformat/data_uri.c | 1 + libavformat/ip.c | 2 ++ libavutil/cuda_check.h | 1 + libavutil/log.h | 2 +- libavutil/tests/camellia.c | 4 ++++ libavutil/tests/cast5.c | 4 ++++ libavutil/tests/twofish.c | 2 ++ libavutil/thread.h | 4 ++++ libavutil/timecode.c | 1 + libavutil/timer.h | 1 + tools/ffescape.c | 6 ++++++ 14 files changed, 30 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffjni.c b/libavcodec/ffjni.c index f5b581f0f6..154be9ae99 100644 --- a/libavcodec/ffjni.c +++ b/libavcodec/ffjni.c @@ -26,6 +26,7 @@ #include "libavutil/bprint.h" #include "libavutil/log.h" +#include "libavutil/mem.h" #include "config.h" #include "jni.h" diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c index 59c61a3a4c..0f6d28ed88 100644 --- a/libavcodec/libopenh264.c +++ b/libavcodec/libopenh264.c @@ -23,6 +23,7 @@ #include #include +#include "libavutil/error.h" #include "libavutil/log.h" #include "libopenh264.h" diff --git a/libavformat/avc.h b/libavformat/avc.h index aced285c7a..0ce95c194e 100644 --- a/libavformat/avc.h +++ b/libavformat/avc.h @@ -23,6 +23,7 @@ #define AVFORMAT_AVC_H #include +#include "libavutil/rational.h" #include "avio.h" typedef struct NALU { diff --git a/libavformat/data_uri.c b/libavformat/data_uri.c index 1863830abe..28eb2b9e08 100644 --- a/libavformat/data_uri.c +++ b/libavformat/data_uri.c @@ -20,6 +20,7 @@ #include #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/base64.h" #include "url.h" diff --git a/libavformat/ip.c b/libavformat/ip.c index 70c5529b72..b2c7ef07e5 100644 --- a/libavformat/ip.c +++ b/libavformat/ip.c @@ -18,8 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "ip.h" #include "libavutil/avstring.h" +#include "libavutil/mem.h" static int compare_addr(const struct sockaddr_storage *a, const struct sockaddr_storage *b) diff --git a/libavutil/cuda_check.h b/libavutil/cuda_check.h index 3aea085c07..f5a9234eaf 100644 --- a/libavutil/cuda_check.h +++ b/libavutil/cuda_check.h @@ -21,6 +21,7 @@ #define AVUTIL_CUDA_CHECK_H #include "compat/cuda/dynlink_loader.h" +#include "error.h" typedef CUresult CUDAAPI cuda_check_GetErrorName(CUresult error, const char** pstr); typedef CUresult CUDAAPI cuda_check_GetErrorString(CUresult error, const char** pstr); diff --git a/libavutil/log.h b/libavutil/log.h index 99625af538..ab7ceabe22 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -22,8 +22,8 @@ #define AVUTIL_LOG_H #include -#include "avutil.h" #include "attributes.h" +#include "version.h" typedef enum { AV_CLASS_CATEGORY_NA = 0, diff --git a/libavutil/tests/camellia.c b/libavutil/tests/camellia.c index 1716b59a38..9fdd6cd7e8 100644 --- a/libavutil/tests/camellia.c +++ b/libavutil/tests/camellia.c @@ -19,8 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "libavutil/camellia.h" #include "libavutil/log.h" +#include "libavutil/mem.h" int main(int argc, char *argv[]) { diff --git a/libavutil/tests/cast5.c b/libavutil/tests/cast5.c index ce3aa80b5b..1ba3075e73 100644 --- a/libavutil/tests/cast5.c +++ b/libavutil/tests/cast5.c @@ -19,8 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "libavutil/cast5.h" #include "libavutil/log.h" +#include "libavutil/mem.h" int main(int argc, char** argv) { diff --git a/libavutil/tests/twofish.c b/libavutil/tests/twofish.c index 7e8b129230..a4ccbfd379 100644 --- a/libavutil/tests/twofish.c +++ b/libavutil/tests/twofish.c @@ -20,10 +20,12 @@ */ #include "libavutil/log.h" +#include "libavutil/mem.h" #include "libavutil/twofish.h" #include #include +#include int main(int argc, char *argv[]) { diff --git a/libavutil/thread.h b/libavutil/thread.h index be5c4b1340..7106fd0d47 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -31,7 +31,11 @@ #if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 +#include + +#include "error.h" #include "log.h" +#include "macros.h" #define ASSERT_PTHREAD_ABORT(func, ret) do { \ char errbuf[AV_ERROR_MAX_STRING_SIZE] = ""; \ diff --git a/libavutil/timecode.c b/libavutil/timecode.c index 2fc3295e25..a37d725fc7 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -27,6 +27,7 @@ */ #include +#include "common.h" #include "timecode.h" #include "log.h" #include "error.h" diff --git a/libavutil/timer.h b/libavutil/timer.h index 71ea2f912e..48e576739f 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -48,6 +48,7 @@ #include #endif +#include "common.h" #include "log.h" #if ARCH_AARCH64 diff --git a/tools/ffescape.c b/tools/ffescape.c index 1ed8daa801..441e2fd01b 100644 --- a/tools/ffescape.c +++ b/tools/ffescape.c @@ -19,12 +19,18 @@ */ #include "config.h" +#include +#include +#include +#include +#include #if HAVE_UNISTD_H #include /* getopt */ #endif #include "libavutil/log.h" #include "libavutil/bprint.h" +#include "libavutil/mem.h" #if !HAVE_GETOPT #include "compat/getopt.c" From patchwork Tue Feb 15 17:42:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34316 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp511161nkf; Tue, 15 Feb 2022 09:44:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJzr9FG/qDqksQuQQtQM1lcwBLP2dN5kKyoF/56rkKrQhJtr2Nhiuf4qzE3J1Mft2nM6CefQ X-Received: by 2002:a17:906:728a:: with SMTP id b10mr187908ejl.120.1644947074567; Tue, 15 Feb 2022 09:44:34 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m10si341582edd.152.2022.02.15.09.44.34; Tue, 15 Feb 2022 09:44:34 -0800 (PST) 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=lM+amVJb; 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 174D068B28B; Tue, 15 Feb 2022 19:43:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D04A68B233 for ; Tue, 15 Feb 2022 19:43:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ad44voxaJFDGPcu5PjS6FcgA85zMWwVGlxtXnppsLp24w9bb6EOnjR0syHnxE53ty5yKk14/OTRTa2qTPVbek4Mxf99cRZCWovpZu8W11vg+o+8Ry8Qr2bW03951IEAKI3SlBygtbYCH945vrQ5GCXJuKR+psnVhzA8N6Vuck/ef8yxuEzx9MLNKkCAgNX1QetZeYXwwmqKdh+TIParVwW2C9osAECjzOiB6XfBbafT3JR+edlK5yWDeqYZbV6tgfJKafMdBGngsrbofrVco7zoqI6yDhnnVfa3QeNqdehGdxTr90MnxssiMS+LHNGgkc2xbUeAkdkZHG4V71K38kA== 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=6MqEIwcVxSdf2SGEWceb1BQoOdhABdlr/JWUlWGYX+A=; b=ZTY/f2aHhglTfwBvhXdBJXUs+PTl5fbKLkKnnH5KKavSTQfWVSd/VIoGHWHtaczzcVuS3gDa9KbiXtMsr7Gri3I+VmEPotAi3pJz2N6DjOEiQpLqUlmteMREZM7VGUVWKwmaUQTttjgzTMX1NURASQWFDOzQ2OjgK85GqW9a5IytB7R5j5Yf6hGKFHi7Wmtmh6/7nQO55vON/n+uNfOh5JNQr9+sWzW1HnySP2E+HI4RHCTl5HMwK/0fYOKcZsoYcFn6KCqMCDIuz+hq6nQsD8ccRIx6Bij6lJEGXFB9qmvvkixmxILrXRFNVjDiYA2dUPsbhJN0cZnwfQTOTxIijg== 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=6MqEIwcVxSdf2SGEWceb1BQoOdhABdlr/JWUlWGYX+A=; b=lM+amVJbBiqL3QBnOKumTPrxrSEIkZUhV5Ks9X7oy/C6jUY3hMHOs1Yz1jo1XOGu5U/4pnSZHee/v9hjaclh3aguFeVpxgWgMx1fPNOyzUAawxZpPw/wLtVYaD4JZc3aKM8kk75bmQF/H6RqmnXA5znn9Mmr2bAHUN59X/v83bL63cr9UOSJVRhHJssCrPYeq/ctXEYEjaZiKc3Hf9/nWunAJIRyFLZ7wtICk1AbHtaR9wjKXxZ6KoFcP4NBTLDm7ALv5jOryF7iAzFpTQiUum87F7vydcUyHIo3q/b5bYn3Lc1IPDOIz65UIoGtA4Zj6o0So+vaf8gYvafprxjoBA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:30 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:56 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [USov6J4Ite+Ax8gYJ28ue5Fn045wyb9a] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2bb16f8d-4e73-402a-0021-08d9f0aaadb9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4Xl9D7TPXJCClskeYXIFXvcuHzyqtykqA5g/7kkTjlouX4YNjk6EXTwHZyjxXKn6PXVnR6cyUBys+tUsveUpv5nceK30MDuXY7J5ji1wq2roRvqZL1lh4+07p7CBNNLaqW5k6OL1C9cSOJbk0mPnPMWtVWjJBWx+E29S6xOgi5o56BF/zZYX923UPUSsQwod6UzDiROJDm6zGxhF5MTYszUksApzwB4KrPkKiIZpZjpEqKl6977OyXL4bHc2yljRln28xtRf/RAfnbkYz842hFfPDZciCLBVk7esP4Cw0OtYf8nGYKBLQKeQtZVIsXbGn5/Bjm4pZkVS09u9ZGgWnbL5xt67BohRObqoxV6BtPwwxTN53b5rb/meCcnhXNMhBYhKLHYBNgZtKMnbDv4xO4ec1wupJbMQi0X0RqyCFpQRLezi30oyBTpJp8ChzayT6QqSizAk84famws/kxl9YHJSlrbjGjwJvhGvkq3ldh9EUFRmKoQMDf3NVgz+aCg0g7qBKBND+Nb4kb/L2g+MFm6ReSMqqvMsz0metK5yiB8PVdssqE++7vraFFxyfAkRCicqr8XCbLJBzejmtvEKZc0lafggRt7gCt44wugR26RcZy79rtMbGaLBe9TSy16EyWDAJVnvysefzzFW3yK1K4LlMEt0aS5vA8YJaIt7XAxL+aBhiQdvEQ0LYNiLP54xWejciNIl6cqWB6LZUojsuvwJ9/50Ca/YXywMwI0Avqtors= X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CXrFF8gvJ/gz3YZdnqxYVFbSjodR4xbR9GTo1BzDkImP9NEbINNFo1a87VRN4hFH7JS6fNCwUBe52ec/n6RRJZ6lwq+rOUIZI12YgQR3OBm9drbkVcwYi9lul+8E8OvczttGY6c5L23BerFeuegdXz+ouZ/sYEyYk1C8aKMLCJqX9VrSqKCXSNsOnOiaX1GexpSZCTqul4YO7+RU+EL5VvsKlFtt4SWtrcDb7Npk2SN82R1BzAgiDKk1JBgcn729S7AlabOhXfZvTphmVI9e8snMPtIy5bPwICrUyEpkHV0DjA3SdnLiVRIamjUYyS3rJg66TnSuQiEyE2tAY3F086FVBCUTq7pcd9i0LM8NyodouWtC1efnx2qYyhIMwJCP6WExx0t2+6mtpdU6qEYCwJ57xRDOMorSYHL8E/YK0vIaLAYLlGZbgM/HBp/z5xfE41e3+EE6sBVazBeataswBd/mv44FH14L7ldSfyNZhRnyCuaRTKHQCBzWrVwXcwNn+1RhmWAiDFa5dMKWi/d2tZ6I9T0IZ1qw/5WJr/8OjSWGvRX0YNiZbf6duxZcyjL9MTr3PwerqW4GYzdgBVJZlA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uAB9TAte3RbppF7uIIdaOwUwAglA5vQjMlWyz5/nTVuavGCy7WqgkOjYyPYjZva8cM6AIsgUcxVRP13NjX+vfeEyvu412ZxdigQRydnXPctzyLeMtEhM50BkCu0hpIKQQ0tZSM9xaljiRQVl2ZtlB/MhwC0jpyOUlnjohJKTNgET0Y3WUneo9/xoho21X7iLctSzHS/78Sf24qvLHGTpUC2H3qn6G0bvWtN0eb+L9N0tzD5dMS1zdEgrWxl5VvuJAxp5TcuV3mdjWGOgMjf9Pr/r5rRTy8ID3HA1JNt2Iz6o2gztxAa+NKJJMQaYmHFu+GPqI+BVSRq2toX1l9RZ31jlYJPVIoIy8xLsTLHy8eRl9xds1RWbEwFBwWqqLJfsURu11k5ZtUEcqjVVhwoH3mhQMPVy6anZEh/NE2CoPuAPwpQO6ydg/NAJYANJgn5uMAXFRDQPsUZLhT1Hyg9nFnJ4PUWVOk+eLWcgMfSa+rDen4+K68O3T97tWXqdVhAjy6z7pyw7qt3/w4ZYEIu47OnKiJT6mC59wRKjF3lltXnEvLpwLViqPpkFykHlGKqgMsQ4+9bwq6Y875PoIPkI15kJNJotBPUZg3KKCtTBRYnVvkKFPsyCGmnR8slW+ByM214h2Wr0QTVa1GmzcdUrRddUM+gvcjh314Uuyjr+4GwncO+IBlPD3r8ohrnRSEINwzeXdDEGw1a7rRo206iK/L41I84IzgGk7NW7bW6+Blfl2kGN3KKoEMiGjPkFu+27VK/sykXte1791yoDI8wgbcFaG/REIp7wP1H/R9ucf/D6sKXw3wC7D1IwJCBmVKARdyI2HFF4r0/cP32OKk24ve+Jd9+RpJTHM2OY+aMKGmGnn9OSE2YkVDyDftyGx20c9DMuU6nwOvN1VX7two4sReoHruouW7EQAxzcAv5T6MAW7aEm8+9yzR2mWd6KDJ9Fg3ovd08flC6CJ7v9D3pzTw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bb16f8d-4e73-402a-0021-08d9f0aaadb9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:30.1368 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 08/19] avutil/audio_fifo: Avoid avutil.h inclusion 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: fA/aZOUZ+6dh Signed-off-by: Andreas Rheinhardt --- libavutil/audio_fifo.c | 7 +++++-- libavutil/audio_fifo.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c index b1355e55a0..f4103178ba 100644 --- a/libavutil/audio_fifo.c +++ b/libavutil/audio_fifo.c @@ -24,10 +24,13 @@ * Audio FIFO */ -#include "avutil.h" +#include +#include + #include "audio_fifo.h" -#include "common.h" +#include "error.h" #include "fifo.h" +#include "macros.h" #include "mem.h" #include "samplefmt.h" diff --git a/libavutil/audio_fifo.h b/libavutil/audio_fifo.h index 9d570b04c0..d1e4c856dc 100644 --- a/libavutil/audio_fifo.h +++ b/libavutil/audio_fifo.h @@ -27,7 +27,7 @@ #ifndef AVUTIL_AUDIO_FIFO_H #define AVUTIL_AUDIO_FIFO_H -#include "avutil.h" +#include "attributes.h" #include "samplefmt.h" /** From patchwork Tue Feb 15 17:42:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34318 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp511446nkf; Tue, 15 Feb 2022 09:44:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrJFEcQEKlqSt+MTgSegocxCaWEVDnCbiCu9L+T1ZMiPyA/CPR+jwiENZVUcKFqxufHI3h X-Received: by 2002:a17:907:6d23:: with SMTP id sa35mr190659ejc.282.1644947093863; Tue, 15 Feb 2022 09:44:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c17si317606ede.572.2022.02.15.09.44.53; Tue, 15 Feb 2022 09:44:53 -0800 (PST) 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=jesNJgf5; 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 0E90068B2ED; Tue, 15 Feb 2022 19:43:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9866068B24A for ; Tue, 15 Feb 2022 19:43:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iHB5eGmL0FyRn1AxTZPRd+zO8RjF+Avgr+IKRg9mXCdZESgrv/Z3tafrZSTfqL4xBn4V9jf4wI3LkZ56qQo7tahMZ1MyVoLkwsfQI18I4e3DCxxA/cpPSnziTxKhFp8Jv/RmAGk0iLilp382x334ic6gLS0jFRyzbH1n9T4UQMkyCVLz1uWTKaBI3FZcD5+ld1DAe+gaRRtR5yWdeBrBjUJF38g+mcDNXIUzX5Ph0M2dDCD2ZQtICSgWVW2Bq1m/WecroXivv9R3EkWgQ61k1fvvbOywdEyOKhpYmIOI7qxvARIYGHLUXAsr9Zy7hZSmA4KhH+953aq58QJsCgalNQ== 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=QDLNyX1vXucXT5flaZu3uII02gxlmsug5GYhyh7clKQ=; b=YeDjrcQfoJDxYkCPiMDbTjDJ+FlR3oplifWhVs6NFwc8dof24lqfJK1VCHaUek1XWFzfqdii1W7oUQQjvGYAx7t7JeIbmjLwBI3Mwp/aypJX0JiTo+2H9GaB1gQ9c4ylG/l2nnlj+DPBJUk7E4/mw2vZWQX4pLERMArNUBN6B/CIezBQAKl3Of7/71jJgRVjwjNAKnsd4xKq/m9Y4HeYYGT+CShvdmADOT2tMhRHQZ1bvKRHy+34q7in8s1qqOA0J4AB9CPqssYIqh3fk1nVDMdpMuP3twEFeGgx363Ioz84IwuXK72Esb5SvO84YBZWzL5mC9tSG37vmG6/PotZ1A== 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=QDLNyX1vXucXT5flaZu3uII02gxlmsug5GYhyh7clKQ=; b=jesNJgf5KNWQRwnSYPlFTeZn1RMAe6Cx+3PIDd+YuZ/icqNataAu7pARbDh06+ba1+mLKL/NGOw+s8AbpJ1H4GL15VOlxxWp5ZEVLUVkK60qBHjcMne9HP4nGs5O2ZXh4I6b2UZfAz7y5IB4nsOMBD5DUv054GxzHPHlhIjdjHulqj8rd7W5BbSU9tx1kQi1EBIwQhEe0TWZ+NPc7r+JPSSti7//NVv8CnaPHTEqMoxDb/KdgOCN29mdI9OQzeZ46eDIdMAT+5OE8WvfRvWPOk3nmb0chIr1HqCed0C+V5dCTxoi7RFDPCFlRRAc4RwLdu+P8c/l+JCkqlz9OuE8XA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:31 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [lSXV8OXxW9F+LnsxpgTmgvD/XnTg/wKX] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d0a42e6-7907-4acb-8d34-08d9f0aaae42 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlEeE76wogwhEvrLK+I6VFqfmBafVtUIrqHpSFdGkOyyJf1D7dU8KMeF+95XUEaiOU37JgZ2xYw+QPDXX2h4Zl+mhxM7Xlu1HFvJtqkHqIxt6Mrr2J1bMyH+nM1dIkiFZC5X+f3TT4bKGLm/w2AiIw4E1inI0LUImXvkskcJ/2PwKzNbv9AwA2wWjSnCRONU0SNZ/LSZ6aqnp9c2c4T4mfgHpEHI8BkWgmLhUsjXmPpHsvmRMO6/tdJQkQx+Fl/0DG1vf0eso7cMWpSHfx7W+Bk2IyMP10Jis5WM8QwhFVqPYFx8sXGMUaaO7KJJFoJ10pBHT8xzFW368xBheaWEa96+sGXMFRysbQXFVFf8UotJufm+pkbslIv4Nq0UNyiiNw/nN8uylkSx6GICQxXxG00ZG0OL0USrVU4SnRLZ/WypqiGiRNK87mJ8PKBeiYPi/V+/N/q5JlZwQMMZMedQI5Gtcbq18xhvT1f6pjGSnhMZga/Jnct3pdya/+R7Ta0qPg7Wr+85fq0CVd2DwCL62RPqp6BxtHIk+c74llvBNSo/dX7DjkRXaGSZomeYufUNWGYegFsJlCrPPnJcQZ/uJzTsYFVgKR2OSESJAfmN+Fi6CqadY578Bux3BLf49/jePAGb8VscAR8hS/LyhYsrKYP4mP40H2ZJam5Xwt/GWxPrrpb2DmbgINms7FvKmfg6UAWSUYbNcJKG/jXHyPcO59OniSXMYUzHt07Na+rg/kymk= X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3fNQvL5j3DEiEgj0iJgUsWrK0N3VSaiw3YG5/dxjDtlf13HUfygj7wrBdvo60tgOespODI1umG2PsgFApMNBlTm8LE2soxyV2siR1j1cesKdUhlDnS7/enPOxRvFab0R8K9iiWvsI6bqr3vrX5nxfjhuICnk5/PCe7Ltf1XLUOKCoB4FqgON23D5aRZbWuPZFpOC7OeE01VUpMggXaYWb4wannol/7s89QLKUgF0om6TfJTumcExZ0mvEYly56HnHl+qGUm6x0NHYIWjVchE6X/ekLbQHRHF2+llOn5tm0aBGIHuoMZh8Op+lDsYjEGuJHGi7DTaeZZzHy665xIlZhrNlF9M9Zw3iOr7a6QZUlcznmy2Sw6E7c4XsS1xG6E4/1k3uhunrvgFZPmYVryCxXUGFyGXkyenJHoAp7uspqMZ4LY9eGCu1u6yjyeJnEPOTDK+N4kiGupsyrKplnKo/PrtJvRsNeNjjZ8R5nEY+iYFo2qJfnsNuPo0BgVOKtZHamYkRXOxTPDYrdj6urykMWiOJ6Ql3oh9/fGlImNSlYIdlRdAtYLU37gh01IvqGKPdjl2NOGraGsREELp8lYJ7Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TKDBgHeDyrMW9LP1LIriOjTp27JQRCQo1F+d0Wwf5QTAdjlGf4I118dx3C2Ldzt5UuizkXl8cC+oF+bDt1IHXbjj0j+282vIp/eCktMse+8RsNVU2idsJ5HaSDZJuDzgoUN3w5iH58uD1BMp6s0+S5O1N8LPWMgfAe5rJIpQc1r8cZPDLzGnLsJ4PMRHJtc87JprBjuUlz29W3JwK2QEXfXniNOF8QRtLbzejjVBxk1MPeau777DsQHw9NjY81MgUR0DZ1Cx+36lx2elyrY1rAo8X9TP4A7xSnYXpsMXp3fA+a4ofl9Ac6gWQE8OZf+85KTaSj77GbwD2U44xFHkYbsx4fxVs/ZlX+6XrIgC2VwWb0do7bnkU+N+6+rgLTpKHi9+yRi0iClGm3ZwU3hS/wgBOLF4SD8w/zf1qkZF+nZdLREwVfx5oowbg9CZSNL69RImX1RoYXZWe6szwdRSFofic46D9o8CMMV2lVfk6Ch36vaAuWNC/HD52tQ8QAzwNNmi7CCPTNqH81Gzza11hMkRhk71QA7Av+mfbkOhV2n7CA8i1pW9VNuZP1GVOiysOY+M3RNvlaJCQbac2eCWZIvIxOYnWJrP0SNcpYXglVflmD7z2D1mGwgt1g9/1LUwvM/iQA9Bra0lnlxfV+8yQWPVbqqPqy4/Dguew7jV8enz8CLQYClA2Mtn8mO+IAw9lIChBsGKD7giUzDLnRd4jm1jgHHFDzgt5pTfH2DbL5DXFdRshbyQxb7DpLAX45RKBQZViggQRBZyqIBCWhEUfaYtc1ACYz578fVkspirHjy3OOoC5S+Mtp9qmwh7kTJIIp+e7m02FoyUeJWhcNGDGzOq4rlYwWvwf7k/ucK09YGs9Dq/8o9Dt5C+7jm2KZFznfIYQUz5vfX1Iw1UW7fUU2AECK0iJ8mc/tABwvqkUU1p0jTKBpvtOAnfw16D/PwcbWmJcwUYhQLfLs8e0wIMww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d0a42e6-7907-4acb-8d34-08d9f0aaae42 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:30.9901 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 09/19] avutil/fifo: Don't include avutil.h 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: BEh26xn82zMU Signed-off-by: Andreas Rheinhardt --- libavutil/fifo.c | 5 ++++- libavutil/fifo.h | 4 +++- libavutil/threadmessage.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 09c984143f..51a5af6f39 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -21,10 +21,13 @@ */ #include +#include #include "avassert.h" -#include "common.h" +#include "error.h" #include "fifo.h" +#include "macros.h" +#include "mem.h" // by default the FIFO can be auto-grown to 1MB #define AUTO_GROW_DEFAULT_BYTES (1024 * 1024) diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 4eb2ce42f8..4eed364afc 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -24,9 +24,11 @@ #ifndef AVUTIL_FIFO_H #define AVUTIL_FIFO_H +#include #include -#include "avutil.h" + #include "attributes.h" +#include "version.h" typedef struct AVFifo AVFifo; diff --git a/libavutil/threadmessage.c b/libavutil/threadmessage.c index 6f25da76d7..f0e23f28fc 100644 --- a/libavutil/threadmessage.c +++ b/libavutil/threadmessage.c @@ -18,7 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "fifo.h" +#include "mem.h" #include "threadmessage.h" #include "thread.h" From patchwork Tue Feb 15 17:42:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34312 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp511554nkf; Tue, 15 Feb 2022 09:45:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJz36ZL4u/Qlst0KVppTVXSLPojrDHeA4o0qtjEdyj72E2XSEe0I/PCjc2qbckc8vLI4PKpq X-Received: by 2002:a17:907:6e06:: with SMTP id sd6mr163350ejc.65.1644947103952; Tue, 15 Feb 2022 09:45:03 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id do9si21485441ejc.968.2022.02.15.09.45.03; Tue, 15 Feb 2022 09:45:03 -0800 (PST) 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=OIKUBmGA; 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 DCF8F68B2F6; Tue, 15 Feb 2022 19:43:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B382968B233 for ; Tue, 15 Feb 2022 19:43:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aXIP+tQB2oiZ9fZhNaZiTjGvQGyYqJagInjwH6JzlJIwJS4Au6nwSRFhf5tPRsOQuZId5HzUEkytBOFrFM0ig0VPGMHyjohXHVsM2ucSWKQ8ciF84Y4reV/3ZKX/ncY7YsLNjbteX24cgkuVJqwpD0JVXPdL4feT7oDVOMH3awvMijUCKMusFikLi1u+cZNZy8CNmHBLj5gBiKTiqwRtZNigFdNtHcKEHFNG8Y7MCMrjGHdy2bQYmNhwGxhOK3F+gXoHeyzYIKmtnd48evxhhC9wD1XsEP+tga3uMJIwybBGwGzB6pI9h5nwWiBIN/GTvo2WLF98hV4523PotC0Uug== 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=BaiiAxvp97oQYyeupmiEJEtN4Mu9wlkUpnMdhyBRPTY=; b=dvGMP0HKr+V04M2GBXIaeKir69lp0+s3NVJZBr9MRPNjRU504fIU05Vn9cNuSjFmEXU0/k9flJd6VuFTr3o0cXhgosAaF8PYmt4Uib2QzFv5c5CDdUyKY1KTjIx3M2mtQUz39TS1+wOWyI1QYQpnNA2wIRBGXWOKe5JzWVOCDFdF503mz3btZsh5W2JMqjU/ht6Jnisbsv57G/ewc0pYe4A+TaXSPYEOFdE4Ulc9afPrxQ0qaQL80187SrkwU05WeUFPjfpGt7aytYWU7/pIb3cBPTQIu0xinHcemUxFwE9YpN6qDUfh2GjOAZCeN4Kjf46RYOtwYggZPgBjFzdVJw== 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=BaiiAxvp97oQYyeupmiEJEtN4Mu9wlkUpnMdhyBRPTY=; b=OIKUBmGAuq2VotIRGs0YNB+MbyUGzeyeExBC4aeoQNLKoWRSxLlZNOtlAXsJfRH2l0sY8FV1E5z5iNNFgld4UavzLZ6ece5Dl5ituG9OtSDRG5naJBzlPlgHZKU7OIFVUuMijm+dFQqZNnU9izJYt/h9EC+KQUdSr9aRgFP3Yyo11NkV6HmfkBxfz2DxlC7QP7w8kJPPXDJBj9onKADnwlJQ5QkpQbnD4brhIXHDpkQaRvEM3gBXLi0BwIEoRBq06suvsAqvfcwNVz4mhXGhxv27178KfU23xTwGV4k2M/hNgNolWiojUX0qLs10oC7wvJAK5SloI2MEfBQn7j2CIA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:32 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:58 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [KQ70QEw++es/m1hLO8vMO1xP9qHdSWuf] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dde9053d-513c-48da-942f-08d9f0aaaed1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlEeE76wogwhEvrLK+I6VFqYEh6s3fFk5fNxx+hFbk5nWCPRKr7dZzuoZsgeP4aQONoyrxLPJKeTSQM+/7CGgRBlCw+C9vYSPQVLfmfzSyUWhGJE8CHpbiqdnu8E62ruyy60DQRqVDVa9ksMfKBxlC2H9JOrjSPJ8Riw5B3bTbviR0aVlfb3m98d+RKvY3ZOYRkqZi5L37i14+g7Bm4qXwxSR1um80GAW+SFI73LBax8fNa1Z8zwA8qt7ACwrTM1VSdreEzd9leQE5NFjUvLjkNAbHdBXcyA+0KD7cusq5x/h5j8yvPnZ9Cl2YjXold+ajgDl6vAM2zMefigZ5mgQz76mTJ5I88lAv7TIz7e/gNZezXsCBK8XHWJ/6QkHl14/a8JS4/o1NFxoDZPYNwtR6alzakrUOjuthbKoQHcklzDeiUte8IPp5HnurEhbveNANki88OWiZSbMo8xqQIkaV75u6PXLifvu965AqiBPzKIb5AHCy+ZqqoZ6gc1wSOVD85XyFYYyV7cLRXOUu4cAafydCyOQ2FCG84fZBwd/gtnYPqFBvex5Qz8if8EcJVViwCMo+QcljLisdkQ1EPmvp86X+T8a1FgtB+Kem3vglSLE6X5h/6xD+TMvSAHZHyCL5faYWTOMrCHxZ/2FYBgFNPazNQKajY8Vn7Im/TREjvTg3BzrB/zE9kzuw/wHLrpu/Z9KIOi58TrlV4Dv6Xn9T+ETAVehJTitTA3ezaQs9/Ts= X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z/1rjz89+U5NG26bC+UKpGhyHSjInK3+kIk3M2UklXSf+vQ2HLTnrRF5VjFe4S9TbWEclLgRuvfVDO4bzSDENSPko8vNNgSMnDUBmc9UPGNjL8xA37YiGhVE4NSPwym29owbFVmBoli3pFwPUpdpMu99u4QfyvfDe2+RrW9vNDW7gSwlA6OUnmGiE9IclAl3B/cufHtbv4O1RuQddyhGf2OWzLjYO53kjTBQFFzJGc+j/AZ2v7SxjsVLNVyvyvv9etMIjp35+G8kRqghJEUJtrGjAx85vZJDYGTksdDnfNmb5JYBeWkxxQZLErzuhuJaKXXfKw0gMSWAar38cv1CjGzZRUD55c7cLHLw10g9NyJzsGr+JdfSwTnMdfqltaJtp42W3RWGqVOBZK1WV5uPQ/MCmosnE8FnsytcWtXZ52dk1pfRKipIwCC2A7Xd9x6+NK7AaJuLY1PHmPkasDqNQ8oi8rB3m6ubpj5gN8nTGHgJrYbLXPFYrL9UQ8DZhYy8y0HZ7gc4pFsoX0Kj3sbSaKMSysA9SYDC+mE87CBhaaZh8siROqpn/ND/ToDY2Kd2hn4Fcn2hGHQ0DotQK6jOwg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jPeuB11M3tuGshZ0bp7/2H6qd4Do7fvk+IRlg16Wtw7+V2CwLzxyA6jPu1+7Q9pbyFXglmowU5uvy4SJvWyB/cauuo/httK8oS84z+jVlCVq4M2fw1PVSaRBZXMxQt3yZDj0oBZTmrz4465CBTio8wLRDDvKSTzXL5qq1Qh3o6omY8epXSFwGOSHgrAdS/Oupb9N3weQ4NHETen+6B25lXbOSXi7keDnNaoNBr1ZlXyvceO7OBUpypQjTBTSWueu0iKOFz/zgOaZDDOQ/5k8ChpgUGYorOC2jAkNI6QTju0tTYgYbwiYtmEkuNVUvekaXbpK2IpDVP8c/K4I0hNwLLGNIKpBRGwk+QiyFbdjS0sKKyxaUbBg8jiqxeod8rs2EmpfCF9/IEvQHsM2QSrkFtG37iPW1NOy5cYLi3kwugK03MNEBNSvHB/FWsVuMxJu/DwfK/NEWVMitNVaMX6SkP6NnBIQVj3QoM/6GkJbvtDay5UilA1x6zWOuZ48LfsbWROE1FeX5S6C0JxA87IV55ONMcbA3M+4ThtGsVVrGJoWeEH5W8polUJy8RBydJkevzSp0OSGzxo8oZ4K4/Ui21ElSHenGNHItbJcOmKiPRKSSuz3cjcyW6E8dnbVKIUpJX1OWwHFYa7MJcbeRja1hdKnTb1Zpfg1Cn+qEWduR1IYONc5yzbFaIIlbxt4MuLElk5qdDTuT48Hrirui+ncPpmqZ0emgalwIxM4GAKczfX3FVo6GvtC2rtgMzc12uNwhqW5PIqcP5EVyaNtK4XfBw+IXOz00ggbZpVSOUPMdsDoi/lnrH2OKhrw1bxvZnKKgHpB/SGAQfMdjwtNbGxd0bLVJ54JkS66gsBHqYCsv9xUKFftqEf6HHYAu6YoTBYK2osooxhPANKG/xlw+gO5wAsLbGGB84SxeBJUPf4tMI7M5Og0RpO52bCTSQgGeBkuBwryU0QcpUKmkfY1LCrvRA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dde9053d-513c-48da-942f-08d9f0aaaed1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:32.1475 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 10/19] avutil/file: Don't include avutil.h 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: mkDry9Wt1Klz Signed-off-by: Andreas Rheinhardt --- libavutil/file.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/file.h b/libavutil/file.h index 3ef4a6022c..8ec210e783 100644 --- a/libavutil/file.h +++ b/libavutil/file.h @@ -19,9 +19,10 @@ #ifndef AVUTIL_FILE_H #define AVUTIL_FILE_H +#include #include -#include "avutil.h" +#include "attributes.h" /** * @file From patchwork Tue Feb 15 17:42:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34313 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp511680nkf; Tue, 15 Feb 2022 09:45:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhkOR2stz4kVfsr4FWdBGCztXDpMUdNkzc7SPi2RBlvZWMMCQLLiP30+d4IFtuASNI0024 X-Received: by 2002:a17:906:1291:: with SMTP id k17mr140113ejb.451.1644947113601; Tue, 15 Feb 2022 09:45:13 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2si23667764ejl.123.2022.02.15.09.45.13; Tue, 15 Feb 2022 09:45:13 -0800 (PST) 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=qFkEhMiH; 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 D46BF68B300; Tue, 15 Feb 2022 19:43:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE76A68B249 for ; Tue, 15 Feb 2022 19:43:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OSkESlTQd7sJwmhro7nRRLXSBLyi/VAuocPuIlzwSLeYBfG369SXKk3qQfvXNz/YdGC1KXNZDTlB8z1htIJdOJRgopolkGiNe+cJ7lZjbBoMvexQ/c9Qbhes0eXxH0Uj2GqxQpfdtUBsJr51bUMtkm8rnxV1pzqGEdmuCI7l5yAvbWTKI13+QUpDDaEt8DhKh88cAglLjr7cgzM8PMHU3Qwgo3CQA0aPsZe4mDDrkClFCuCzl1PZRs1rHux5vU070hXA8Byuc6Vjw7N3s0I0ok4Y7H7nDGKtM0Sv4KCElge+uQkhRNgI4B56VSia/XxZUOK954VvWS1RO/ihncQbnQ== 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=86DYXTeCXJdGAtLp17HY+WeDo5EfZza+T+LAdSgP7hs=; b=M57Xn081dnlkMam5S2gEpMklFAFY3Kuvv3hIZjMWRZ3nG+2L+EUbPy5KpwIklncZp5J5YQT96SPlQH+cYAkdMoYLU3nbayJEmGLQkkveqEG42NFBcTwuiRziliza4dB4cbgtaNzFdPa+r5+dZTYVb7xvzbHFHhm/tcLkPTBnwqRfsJQ5h7VkQZ15Rdy+fcnOAqyq3oosmWhc4Dr6EBdAT4WcY+h/CPF2L/8BhxXTMYl1IGmrV5owV+P2img3jO7rpm157vfP0SVCeyQfkOH0xka/Q44EjvWIkmij1xLbtjl7plfKTV4i4DMkXYpNT7zt/l2bAGY/oOl5+1KZOXJF5g== 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=86DYXTeCXJdGAtLp17HY+WeDo5EfZza+T+LAdSgP7hs=; b=qFkEhMiHWe4Gec1YRklNFeCORWJ/lw5zXWFcCATblG5oEALmGRzdlfyHgmX7xsqoNFnKACWb8t8T1ibJr165o9qqX8T1ha/vxOyzhQXDheB69dpzQf8lP8U7jT/Ao/UJKiN0/h16aatqfpqbZF2PptzjYdiFLRAun0FQ89SldaJ0A2WRzhuLKfoit5+jsCWRW6aQCC14e0Ji50cG4gaRxDC9KERKWT0BfBBdbHrMfczWjPXEZ7pgjvWC8X65jsZoGapYyqnED66yaHhu68FvBILSn2FDXttiIZ3snE7fiQMWwFfCrcu+nz2o7o8cyyEOj5sjx+rT61WZM8V34Benaw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:33 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:59 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [LeFpC4mqOAHvRAVltptUryElJCFb5aT/] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36342457-1975-4f5a-1b0a-08d9f0aaaf8e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlEeE76wogwhEvrLK+I6VFqcCHDXzR6LrTCAKW9OpN7JpuwfrSGkR7Ut28fQSrIthoxLbAsnuuE0EylgneT4EdoeJsytANq+aCyojdhMR/lFZ3qZfvfH0FeGwce+ahdqooRImEzE5FrvDsE7fEQqBCF1HFK74QoxlYqsiyxWjM2YSH0l9LsQoenU8LSaa6N6aglWnNDebtqYO/6e7zfni+PRoNm6fvoJqB6trmN5pfoD9/V8W7v9R2ut1DuUty/fXhxfp72y6wRLZj8Rrrif9HNozpsw5ZykLfRhwU9koEGZZ1+kRgWREcRXT89g/ZcHhdHGma1q3bB3zFxDiS14wAX00U4IjZgqeotLEgdayWq7rgST5txgi+Lk5Gfq+KzriqPIf7oC1ltMdis/wmwQ+lwqEryV/Qkqo2fTYpgsCkuyk3FQQbwGmn0R9pCq4UF+wpNunqAl/twJCS9n0dqLfLp9iPkmHruYEL9jYQ2vwlDPT5aP6xT65HONj4JvfgEEAo4ng7dODdVspt9OUMelNjBAE90NdGJae99QgNprWWI4m0KIjRY0mDuy4IfSJd2bb7sNUP3Oe9irnw97t/9JHiDHmH0nitDsUFPTWJmXcZ/uVMtJ5MPtNN3ONSVe4cptaPaHTob7HAwwYpRIWhoICQh7HLAoWKQRUAbUkLbetZ39EYEKV0CBPz1ErfhmSLvyoNkCO37yQBHFNTh+jk66jetMkG/Jr27PWH68UcKG0RsTk= X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Ii4ht3G2QcM6FviyYBdeVeoJ5G9H0ZFnQOtJQest2VhtfE8ZySGU3fyfY2eo5hi/R433VaVo1QY4AMVcljqD+iq4i4WNPmyl5izmfBCUP6Y6tl4ETDpxeEbbOkDWBjYz35wyg8dU7eRSJfyNBcf1ENY5Uluwr51XreRV6HWlGxSQRLh1K28J9FUncFPxPv5Y2Iyapzuqo9gNAS0S5TyN/PNepfsb60puGwybeYPbdRIkBmdPI6QhwuwtmuLPvXFMjYqdNA4anNuhZDv2Np+kAm04ME2Sc9Lr+SpvTNQ/S1HbYyeptNTeVFDBmkFRv02iRVTEHIfevbI1+qsKPmVAeEO3kS5Y3yr4FniXv24YbLRr8TmzQTt14nJP5QlObU9F0xHo/6XuAdsq61EiyYOAb10ipVhyllwxTk0PXfGV1IU1pxSjlUCLQtrlT3tOppAynitw9IPQlyR+o1hNdCaNw4HtoLnJPBpUiixO1LC2a0CfYf8MoO3IaCE7NGmkjFd0/8pABamS4VGBM6z7+tJXSSHZL6MRvZppYxtzpzhkF/1pqrzBX03GfV0Zw4LS/b05Uk05lrB2eYqxHDxM8unUQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C6Twgqv2cIfGedAG+a2ZuVuP2ISHiitehO+VF/Wry/HGHZGMDnnH+2bJjoaQ9p4dJgW98sX3UfGoPTVfAZHbNq+ZWLs8We9I3z61aYtM02w+Ms0Q5f7xya0fG8l/6t1faBy52uJHUS8IzxPFYjZmFgbKekcweUdbrUm9/OvdSGaJCmP2TMkTbzcE8qgMWp5fJYPY1zLexKP0nFMw7F/hGxvQ23hm5XxaB7h6doH2w0N6kSE38HaCXfHIk1edFSE96iT8SCYcRPQwdPqw9LEkWNIwDZt9B56lJAi2Voby75FWwzo8FCF+mngwBtCr6PLeO/pAK3q8QjF+6au70OMrYjcZdNM8nOZqId3XF9V6gdrPXR4crvTFYlN++XZ5z3dyoDnLt5BB40jjLU6ql/tQkEElD14dmqs8pFL8+b6Vg0FvT3Xqm2115Dob7Ba3unJANOVAI7DeEyVSTYi7OLrOwdREOJMUrH4FjmsB+rcLZtJB5aYSL2CfWGk4TuJ2RMCuYzMXPdu0JqR4g/UuQNvtsbZs/rynK1aS3tjWXjc3/DnVouaqtojuTdO5bwG7nP7lJWP85s24XTthOLHxM5fwXucFT2ST4mrvwaut/LZUd/coELEPljlgv+E2wSQ5gPL/fmtxoRaJOMA+z1KNaOowPDK31u2PEXTXdJFLRXo52/4554mV/ViGJIhf6a2VT/pV1MLQWB1zVVVtal9Bt7PEQN/Jo69v+DNSXQdjZLEMxYprIqrmpx2o7+BDQO1tv9297sqX+MwFLcqUvVMBq1y5kH5mj1x4M9R1xZPKfABi4qG82bXrp7g78+yck6DRWUTgqtKH+E45eHN3i6TAl48mrGAF+KbbWCIT+kikXqMUnKX9tgc2ax0oS0HdYUiTb3yrtBZMzgf5wa1jjiTKYkW3iwDfagBV8S4ZtLNu+U5zRCg5j2u9zP5mixg6Zm1Y9vyg1K4lhRJXSPVyV8aGme2h/g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36342457-1975-4f5a-1b0a-08d9f0aaaf8e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:33.2255 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 11/19] avutil/eval: Don't include avutil.h 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: MwpAbgzBPWRH It has been added for an FF_API_* at a time when these were in avutil.h. Signed-off-by: Andreas Rheinhardt --- libavutil/eval.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavutil/eval.h b/libavutil/eval.h index 068c62cdab..57afc2d562 100644 --- a/libavutil/eval.h +++ b/libavutil/eval.h @@ -26,8 +26,6 @@ #ifndef AVUTIL_EVAL_H #define AVUTIL_EVAL_H -#include "avutil.h" - typedef struct AVExpr AVExpr; /** From patchwork Tue Feb 15 17:43:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34317 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp511329nkf; Tue, 15 Feb 2022 09:44:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2ymS/nVPynt2BF25zjGmPwHDF+5f3g+mAliiLc9fPqb54k/EwYCAkoE/39L4ZdOyY8qUY X-Received: by 2002:a17:907:d15:: with SMTP id gn21mr126977ejc.701.1644947085366; Tue, 15 Feb 2022 09:44:45 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p17si286145edq.232.2022.02.15.09.44.44; Tue, 15 Feb 2022 09:44:45 -0800 (PST) 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=drhAKgKa; 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 3A27968B2E9; Tue, 15 Feb 2022 19:43:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2011.outbound.protection.outlook.com [40.92.91.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 925EF68B249 for ; Tue, 15 Feb 2022 19:43:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kojz0lvu6aDBj3Ky/vwNGLRmpA39TlX9cns9xOMIbRjQo1G2+SSjRsiEok+F21yTiaZMOykGdWPbQwmaDctnTI7Q9lj9v48LfU+93HOtjUBrL4XHl7n57smPhFvaFIdhkNe6TGEk7sh/n01eh7Lrp2SbH4e7wruYnOBBg+bsrcBJ6wjXwSoNURyjFlVna3R0mr7NhjntAzisI5Fh/vl9pOiWJ16mBVp0BMoDCbYsHMmSShMX5g3vOgpYBZVmi5Byz34McMNA7GSKbQvWQV1gCVieEWxD1TWKFPdDBZgUgAwZ+CzqGLLuSQne12yAh4kE269mrE7wkSG/18yrASzGqw== 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=a5bQr1MRJmhrK/iEwWucnuydC+9tMiCsr+cezaMnDNs=; b=SOmtpaBGUV1yR3fB3KB1Xbv6lzcNBPk5eOCnYfxFhWkTTniXap1WtOGeQsrMBL7Zkmm75bRAgIFDl6qlf5wCxg5vgm0Qxf6/iQMoCug/FxLmJk02ds5IMbXGHUeofONLBImdWxD4jdLCU64fJBQA1cdodZIutlHocY9NpnCU8DScpjepetaYjHNTNKJ+u3lIenjVN7Na5ec3QjKgUmVpl/dKZjygJNgVD/fo5KTimhHWnMM4mu372/qMvhtgFg26YfeAtuQ8Z7fIIDBmHwUAYZJgCTucsvvPobRdKmDm/bsFvmC3E+xp48zZgYWyptmioq/jvRMSgvv95G8IUdf6uw== 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=a5bQr1MRJmhrK/iEwWucnuydC+9tMiCsr+cezaMnDNs=; b=drhAKgKa3WWZ43ukGrNsiyn54d2JQZp63PulEeJLMrPykQFVGTA0rleLod2Jq2GevAoIkqHTYCfN6mzYqs1qdym8qV2zCMxOrvQsAu6WRano3bvDFlZMvCmVfKXPsz9KdcHoXjL25Ferb77SXNmXoXgRpCIOpf515zMNO+u9Ch6vFWZ0r/0UzdQ7nhvYS7pQ9WsblNcfgtK3FfdQXVEmlutun2/OEM7pptSYQQqHOHK+mkZLZcX4cxelBFUcRfvUN7XXh/Pe2SltiPGQUrzGaN3ycWITZ9vzyZ+im64OjR5XYywmVD7Wcm8zq6d7gPoeIaHlfhCRtrq8gnbhLqQFQw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4359.eurprd03.prod.outlook.com (2603:10a6:20b:a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Tue, 15 Feb 2022 17:43:34 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:00 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [/rU8+vmR8fBsrto+AgZ1mhZmvz+AO+ra] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a833ea7a-bb03-4d12-2211-08d9f0aab01d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlegDCco+FbLDgkLPd0xh8U4nF99jKuYOLz09Y6JrVZvsAW2iQwcSM2jMChIV10qF/cusaoZewtecP+v6LINbC0pMC8oY2fJhhuF+GQjYqmkjRYVf/YljXe0n0bMZVqJPTv3FpQ1tPBPT/tl3QlzvKpTpnee1EqfWKVdeTxWD+u7utdJhvgfQOrm4avblGezzdT75Lw/0AVELTH9DWjwSvbVMtFpc7iNABxfTGZllddS53cxmtAi1dU048wr6PakOsvkxTmtW+MzOHc0fsYsbO7sLyA0gnDnoctXoG8pOOUIncVioxBYK6JuSAwYGWh6BWzRD9djLUkB0g73bWczbEUtP1JsG1BYKHdDT9tqT3fmdxpO8Xp6o3QaLW6wsUaxTl/dgfQ8OaoWX0/sMBUY9shVy/PBW62hvxaEMAOC7JL3YO6QRRoVd7wsUv3sTw8WIhbTWAPsJr8GMaWE3JTyeT7lPSJyguAZcRR+8PRsxQKHE5RFSNdFCvc0ZuJqV2dV4QC/Ls95AUzIfW0QyTkSh/zQwaxZU3qPlsaxxChOz4uQcHSr6XGRC0H419Kl9WwV4e3344Srq5wvh62jpI8qI3NhPVtdr3ZZvTdM72cavTgORV3Rzt7nrnmjBtDG7o22MUOgGZLg+/lX3MFLPITyKPjt9MVWqphg5WW4WONyArXtw2RuMS9OCrM2ZQ8WyXdHlEsd7fum0kl8OP1muulISbXm5ET9tJ2Em/hKEELOSITl4= X-MS-TrafficTypeDiagnostic: AM6PR03MB4359:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5twr5IPvePMGaIiiFo2wmj4mQdJfJdVgeTL+/FypZMUqVS6rkR4vZTCjRoLE3cJddngx5ClOp53WdsqOnoJra99Q01CxFOh6YOQma3hptKMoUaUDgiWQ3XQ63K6Wr0XwO+IyeNmWCq2HCKadRfPF2ecTQRbWj/Fu0IX/YUm4xKvn8FMib1zxxhWk1vdtvfKgGdRUtrCK0qDIpAYU/83HjDzqg066csn3g4xVhEmTc4X/dJPabTJy4r6w1Nx/7vbPy/LdhI1HswJntPdctgFV7MjmxtjzlYCg52GaPrklgjoY3wYq2EVAJVoYIKmpmpgMkO6kDFfkvpbHJdGXBz9z9bc2cqeO84rwkLzAuVPsOemXxDYFaOFsiA+/C0qe7Yfkv+hzDQc4IxONfo8gatrucfBSkPtVLBg6G0yd7cgEvIHg/ycgCKGZwG2XGJLacKlMdJtsflrVTwpM0OmjHxQJSMR98MbAeue8sxYIRMjUFpsnjmm0X2Rys89LYHqmJPvMmePoo3CwaIm3+hrW1wvt5pZCYAu2L5lvLD8cetAP+ggu0frrotwx5EstVYQw1gUeJh8TEZihBCyub3hP4V3lRA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MXKiIdFbO7XRjXkT5yrJpdcWmstqVmyTTuzBSLXSz+YdXkSgL1tzDPfg1WgbQD/G6DhUcwoz9fjAfMYlVgrcCHKV+PIcVHx8z491e2PN4v18Wkfhx/NLnPNJjBz0xAtCOY+sFEukUfQYsenLBeGuJ2hdY8YUsDwaiZ2RUHPgW8uhugJRGP3zzukmGvtFokp8mqpWIfDMAFQHM3T3aeMi0aqTy/x0rRIQ0L+yHpt3yL657PojFAcsE9vVAsePhkZReZEoXOI1Ni6R8d3OaKa5J/2GCgyiEGEfMCkF8J1Di4r5NTIYckujhSFfnad8bou5uT08AcL4VRzCh0o2iMMVANWnG5SSKojSCcu7UyQz80/xg0jSGLZte3aSou1DIIRrIjwg4+0ZYOlDlBQEwcgtsD6jFaTZCyo8QXdtQ+rvqvNDszc3kVWwR5JJk840xwtWnUaLJViyX4G8o/Ga6wUHpHsuMqiAaoUmgRvMfePhNnPOjGqw1TsMAEtgFyCvKC+sc/VINoj5r/NVselOBLBfcnii612oq5jCzbGTvy7CYFlTlUfJEJLFTA/7wd2bcj+86DlCQ45DCPiGHBYzaVX1d5+0FqmVTnolgJBnNdGTS4NPrmjxZjiGcKKsnEmK5hlMlsyoSJvGE6LqdfXHN/lzFEYg4BkvRr0f4JBiNzg5qoHhDhp38rrKJ3vSuWozBcExKyXVm9LcwS3SiFWTXwZPSbkYSOuZO1kkU7j9ExqJcdCIq2Qw5EC4zP16w/3CxFXZEcKHwb2DH7YlfrXdaLs7YbVRFfj+stqKb+pUa1dE3t8CFKMvZ2aaBCQ0RY3154KOh0QL/BO0UnGEkhoORBogzImGosUHtrQQc5U5is0b6BWHpU6ZAfy0aqX2vNzt18m4it0wMgmE6XghN0p6FLVtADOBPVEP7gPWtIyfDGyOsrU9HJi/R7YdO/K2LxTwVfnKrsyx3hsw+kQKNBCik9eEfQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a833ea7a-bb03-4d12-2211-08d9f0aab01d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:34.1798 (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: AM6PR03MB4359 Subject: [FFmpeg-devel] [PATCH 12/19] avutil/imgutils: Don't include avutil.h 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: XwzjWeH0HnSR It is a remnant of an FF_API_* inclusion (back from when they were in avutil.h and not in version.h). Signed-off-by: Andreas Rheinhardt --- libavutil/imgutils.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h index cb2d74728e..be53335568 100644 --- a/libavutil/imgutils.h +++ b/libavutil/imgutils.h @@ -27,8 +27,10 @@ * @{ */ -#include "avutil.h" +#include +#include #include "pixdesc.h" +#include "pixfmt.h" #include "rational.h" /** From patchwork Tue Feb 15 17:43:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34319 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp511886nkf; Tue, 15 Feb 2022 09:45:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxCXiFWU/PyK7HE0RkX3PZJa5x4oKGCUSekATnri8oE+tvPJk/vuHBqS64/4G5kKrqJmHR X-Received: by 2002:a05:6402:254a:: with SMTP id l10mr53547edb.230.1644947125135; Tue, 15 Feb 2022 09:45:25 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m21si275011eds.337.2022.02.15.09.45.24; Tue, 15 Feb 2022 09:45:25 -0800 (PST) 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=LK1iplBE; 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 0407468B301; Tue, 15 Feb 2022 19:43:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E903B68B233 for ; Tue, 15 Feb 2022 19:43:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TcytxHJ6uchdMAPQIPWbwxV2MEAR3j/3Bk2xqpxtev7lbW96Ie9AYXqO9tb9INjN85+otErRxPHa5qJvzpQHHRP00xYpu3ejFi62nh5vljx1/es417x8s48Nm+vC63+mrNHRe2HPT0Ds0VOi0AJdblRavrogsdvNlHBetRdBzvYs1iFse7lJEv7SvFFOq9w3OQrbNn9r4YdTqr8/OlXDbnRyJCoLGCLvpLWi0Ffr/zV8FvfrIOlpdMIedgxgO70Zhn61ZK3wt9ZMM68AE5vmMeuwXm3KXO8i7N76Xr3hkrcjCrVfO3MWWQ24biBzm1T4pjJ6CPtv2kO3oNUAUYFmnw== 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=Nmvi/wzRpi9FlhVItds+419RDKDLkKbsHsVLTAB/esU=; b=J4d5RV/LbLJG1tA40YePYtnFxl8beIWqWwIx7CrJUwKbSJ3lYdDCzkb0n+7oRd2UJ2BDNpeyPnGMhiWh75g7BBvD14i+tvUrFMA03XG8lOAp1XWAG2omzyV/XSJEOyNSDbS6Pja+uSiOUqmnGczj32QnHwLrr0WaKkMWoIGizBjjCirEBsfsH3TxiplRWUjZTpCiAx2+frNHSfYDenuvfSu4mhJ8zJav1dZ3FG49mYa2v+GcrEoPYr7Lx+PMTfphh3rouFEN8wP0eRGPXxNjDBlLlJOwqRGbdWCljZv06LgawNt1MLVeMKdBudQ/NEHy/88aQnNhdWUpEUyuRrRBbg== 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=Nmvi/wzRpi9FlhVItds+419RDKDLkKbsHsVLTAB/esU=; b=LK1iplBEVrQZ+J4ITT69be3Na3xBthPYjdChIv1v+M17cdKDmsCgA+6j673N1qFfnx3Lj66R45JZHY8rKxfi2wm/lkH0M+10XqK1GXprF9S7TyVGgSl1DZzt8aT/H5buplD9DWrMXKG6JGtR6JDTDJ+VjIZs651NhrQUkpC4BuzFl9Yud1HB6tk74aWS28FguXqTWItPx53v8LZM8Xl0qLrpE7/M0A8fVGdI39sRzekcPpk9m4tHN5sldGLzD+ZyFGXUJ4DYVkRRqI11yFz0LdZiD+37/By0mVdUUli4BUfyaT1leeo9mRb0h6fNDqzjwf2wrZpiyxj2Z9TvxjYt2Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:01 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [/Yli2o+R5/jMKh5volg9Pc+ru/J6rko2] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6a849db5-9731-44a4-ec0a-08d9f0aab0d4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlTSgZZjIsxmFvHRzx2e4BRbWY7se3aLiLpUYmL3ZWuHDRSDTd7ayLXDfiCwIeMR+2HNhb+NBKo5ku24p3Z4Ez4ylLoCOPJ44ePIEDc4DCYqekEMkMkZAPr/fVLO/hqShye629Q2RuteUTXEgde8YUBJCm/HxFTfdexyoxnUUz8VPE9ia0b8mLpJiH5WeFseJuvVwwNrpoXZ0Of5xzMbzNgn8lgG+4dmY5JL4dZRohCy3/wEjZeQEugwqNQkF7LtOblqgTJL/Y/ebAA/vftqxTi4PlrWy5/4sKKFhvYelee0w7GM2ZtyA9HmeF9GPoKpzB0iIVCVCyp5QF0pNjzFAzQxW0YOKaK3GX1A/Hnembarc2qfzUyQawfApyEOp8lfZTAttaffHRPr4EzEOQDCg4hGK7EBlcB2mjr70wtdoaRklz76zddlttRs0ungjwcb78RlsSUW1GG3khILOHgBM6wHAg89XOoiMAAYUVBwlfalUzFTWMjACbTSCDrqxrDHBIl2vsh1AoYMG+IkT1B3N/sbrPftbFzvAbC6dhZZLnKAJJ066bzH5WRuA2srQZIDWUyBab5RNqR0/pXFC8tM5i08/Tu2s9G0wkFIIC5aBO+wVgn/d+lIROtHMkX3Dg6Rbwv8JCu/W/vPCxQJapgEXwccSfUGgCURsoaKU+MWHHa+azvXh8YSEiLzNIPQQA1+CScdiVu8SE3eflUankhy6+ct8Cc3YYgjV63uL18LykjEk= X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7GQjWdwN51OpDcIide0RXpSPhT4L4YTEN/JCEW70jI3nGTU76/ETjzBbjcxFRdmacQp6HGPa7SQwChWWI8G4xVjNA+Ix4qlaKe8YiPPCEZn1MPjFr+/vzIH5XYdU1/+QmQz84t+XkTcTcHX7jGgBwLtgzSeoqtjJH/0+fPHndz0t/Drd/C+NLYZRra3zQDirc0dTJvlX/C2n10uN72lptWnJSl/nniFmln3pCtHmuMRijpeO+xl7ygtswoqB321eZR7PiZ2K0ALNb4Ek5kkTPQRhSIg3vb9SOieVk+O68Zo0eVVq8+WIpQhqdP6/T63zjOoQ2bfFWTOuerLm4NrD3X6ldYKq6pAd+5wX0PyJLw/4UMUGQXd0SRgKrie3A+0+g3+bywbCph3s9dXJg1b0RWZNi1ZuFPtEeU+V+MU+v+Es6uMeuS/4TtDANDa+104qBG/cDDcmII5CtZ0OhIKuXjP8usZo64glzax0jnq+Mls9bs6mhNb9dvznFpLmWsaIpVpxr46lcQdGS6xF2QsvJJkAt3Qy+rInupLIA/6xFsnkY8Lw9KEHYj1IunbLp3pxBsf9lh7vHnKaByAAcnqtTA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KOTz6MSkTpdoVRY3QzhSFmusxfTWaGIkwlskH0KAQBBTKsORIGytnWfr0psX1zUNxdRic0INoRLHadXxrCMAudK0XJMKf993sUkryNOH9eHw6Nso2YiQM/LGPk3okUEasywgYmbuiJSnV/YRbTQl+SWs8b2Aezr28wTRIaxwypdjQ21cYKth28tAaOrZiZ6+nynUxAihJR9qilIInQcwXhQexfTpIL+TyVBaFVBLrBNZsjbTqLEg/3qQVyfByv1xR4XL7tZihu1w4tCXbL9yjJS+4MBZzpLfZ+CMV2IUHikwcQIah/bNcYDmlN4Ha+ZEZHVeg55apo2ovfKN6I7L4ZmR940RUt0PRVu4WY+i58kUAwT5UcP6QNQmCcx3EcMhfFtnrAVScn70IOZ3I3iu5l7G7SLpkRGxsoUrQmym/zAEm//W4tB33UK5eUvuDPjFW4W2vsuP2yR96rGxV9jQ+J7pqghTz70rslkrVjyHzt98gvGwzYEzKYTKAtLxm7cDSPYbxh2A4nKvUU1mefF/qZSTkY19kGzYskWpQ09ox19UOUVqs5d+PAh/6arJkZqEnA6/ALiM0d0GB/sGJJI940BBC8ddV8Of2xw7QGvxDtOCqXMD5KfalZ5urnTiN7nNAPxwKdQ504n8Qef9sP5hTXcCBqE0+zXUez+CBwLH16Nt1tD9qaXT5s4lUSAgKBESEsIatjVepTWY39xsehpI1Je7k0oyMwT1HvdZUBA6NS01R8jw/MJqnQBg0ZvaZCNdw5VjNuf64ZO7opfwy+4eQqbWwBBUHlrz1TWVYrDDZZLMVK09W5HnkfuDqDqEKMo/Ji+R4Rj1f/SKUkS2Uy01GVW7J507TbKKdixM4soj4DfBnn+LO76f2j9AEp2Qe7R09xPrYdSDdf1WdGYtoFTKQpZhROcG8wL0zfrD/MB+aeZcXF+lcunRtlm3RVAh4lUQqvbj1fVx7ZjVU9PlMNBDcw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a849db5-9731-44a4-ec0a-08d9f0aab0d4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:35.3673 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 13/19] avutil/samplefmt: Don't include attributes.h, avutil.h 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: O9b2NEgy/azK Signed-off-by: Andreas Rheinhardt --- libavutil/samplefmt.c | 6 ++++-- libavutil/samplefmt.h | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index c7428940e1..6d3ec34dab 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -16,11 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "common.h" +#include "error.h" +#include "macros.h" +#include "mem.h" #include "samplefmt.h" +#include #include -#include #include typedef struct SampleFmtInfo { diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index f270199195..1999c9bca6 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -21,9 +21,6 @@ #include -#include "avutil.h" -#include "attributes.h" - /** * @addtogroup lavu_audio * @{ From patchwork Tue Feb 15 17:43:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34320 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp512084nkf; Tue, 15 Feb 2022 09:45:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwrQX0Xm0pFX5YI9UPpsR3TL+kUaZUZ/QnnalrFQZ3NHogTbCD9rH772fEQoyKesKeqMc56 X-Received: by 2002:a17:907:7290:: with SMTP id dt16mr176291ejc.400.1644947136725; Tue, 15 Feb 2022 09:45:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b8si340257edk.124.2022.02.15.09.45.36; Tue, 15 Feb 2022 09:45:36 -0800 (PST) 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=P4gyePtI; 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 03B6968B30A; Tue, 15 Feb 2022 19:43:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2102.outbound.protection.outlook.com [40.92.91.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AECF68B2DC for ; Tue, 15 Feb 2022 19:43:37 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CWblMusvN2XjlpWr1jQ8YT6ifg5jszxOaWvwA9U9YXPbMBgQQ8SAcJGV8mIbfsQ+xzXJFxlSvDMlaXUu1You+mTVJ0nXpMRjq8pn5H2kMqk3evEJpiibhz1DaXjiygVMjQe+CAR9P7zfUkNGd7wiOe44EQSGxDHIDDr6EpkVkqJYQ+9+Ip6ZioJHmlQv+opXIWYjS0FMnFOHBPRqTeqd9aV45HwJmbMoz+Sm2tCGXVA8BKnBu426cRxoeFeMfAi+w+OfsSJ4OgAn77g5iLpNUl72egSTl27Yun2IXw+IJpY1wvamEYK69nK0dp211SEewT/fN5G7fifVG85AeDzreA== 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=L5Y49P2njIYTTKv9jYPIpLW1QaRXbHCcS+clDBpp030=; b=Rijk1EZy5bz2xYlb+ESTIDkM6IEBTHqgPZmQJkRY2bmaCUkcBVNovMEnyc7VkIG5J9AXVkL0Uu33ioT2hqA3SfTRdgnANbllvVpeSAlQPWOHFbJ081qw2M+tRl6YHnmiMJu8UHwmGU/C/JP1tg4vQMUfDSGUWwQnBKj2xByDK7WHzz/IZVaPHUd6mJwRiGtieek+FcLkbo4M5jinqtryDUON7gbQUUbX+UtKLmkeJMX66+FT4Ct1OCfMd8o+tpFeWpVzu4PedEgK3ffpnICAVlfmoe6ErwIKiTUOXKFL/8FVMreomRrjIaMy/4il7LCgAcTE16FQ46RpRXMMBlHz8g== 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=L5Y49P2njIYTTKv9jYPIpLW1QaRXbHCcS+clDBpp030=; b=P4gyePtIx4oY8+mTzCJRZpwJNSyfo+MCVp6eQPt+Q0QTnHd+zOZeiPEwNKoUgBxsVH1oU8A1CxwlD17RxoDql7C7+dLFPSj2p7Cl2444BBoyrWhQzSJEaaIinx796S5rKQ7hyoRjR+j7ucQlRjGb1Q8M4QGh/ZKAtjjaeq0uaGz8/vwPlw7TxdQCqiBqqOmBDsxQpkGSYS50T8r+6wzHifSBl5HVslCbaLz7zUYWlMOjqmyw49/9lBg3in+TkIgWnGx1CJNiJSv0YD6TkD5+rk4fUsv7yTuXlGQSB4Y4W049cThw57IYI4Aa6LUuqumMqMEZBK4RYKlWj6ttNiofsg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4359.eurprd03.prod.outlook.com (2603:10a6:20b:a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Tue, 15 Feb 2022 17:43:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:02 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [BFZTG1f8BfTWe0ChSdJJvI2l9N66LL7i] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69dfe226-ad92-416c-fee7-08d9f0aab17b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlegDCco+FbLDgkLPd0xh8UzdFT1krTp6uB+UFcylrVbBaV2q8w92YkrdJeRCCrGvCOxXCXQXAsuwsTV+rTjnF2C5jBHbQZGQZ4zGcl0CPCNZusaszj8Rci2A5drHG6VDeas9igoJWHzUwj9MjPWmP8VPGw+IKe8Ct460MsD0Icj8YvcNrMrNACti1Qvg7pjqPviip+f1+LmeM/onM64Rcpk9kpFvsb5cYGR6xMHBgWiG3WoJxOrA0PGrvmNWemGWWDRkvCTE7KBZPEWtL0XWExRT2mzs86Qa2DvA/J8zE+BeJXXBtfiHsSORWoUclfC0QerJ30ifmLhSYmYEkUqxb1oavmSdZ2EcTiwJPO+n/0RUkILLc9kcE6nlFJxEI0fx6ASU73mlaRRFxuZqDunqo20ahZXksLXbjNz/I7tqi92flSS7226Upkyv+/eUUuURTOsadr1Z4I4568GBtnQlkcdu4oDkusFfwAzNDrT9spjxDEmE9VrRLa/QG3ZMTrBkDC8gN83gSN2gWwU7BxMDjp8fP//k8Hey3DulDRMX0SWZzZqvR9tIYL1W15KN88qzSV86By0d+idwMig/J2RMdd6yf/yceZR5lYLyPUw4x24NKBPpQKU59jCiewktFsAYLOikmFnGe8S0gfNHJHl80yC/rtYgxhrL7VZvccOs9A3ViRg7DRnbMNrYRZvDE467k8NaYhJzP/Th507uR6V/rNQbZj7DFPVkXWB9++ERksWM= X-MS-TrafficTypeDiagnostic: AM6PR03MB4359:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wz/yMB75bfLv8ue3PS6Oyie/8qP272/ZiaoFvdZJxUPx1rr/3RcUXIesvBo0vm+rjTsEokss5cnxJWybpRTkbsv4tdU6pPVuEDumfEAK6TxSMO4lSUJYq9dzHW2eDQZDlkRla0uNEP2NuR3N9w/unlbGMb50v7zfwJylZyKr4hV7OU9AAxqZkdGgqeGjXLxCkg1U8GXHXhdE4zgTQdKKRFJbvR31VCmkr6xcmxfdN5PeMgyZHKd6Jrs7oBNUP3+T7demI9OkEAJ/RO9IQYsvuazoAz5KxcgJ/levS0oB0NpoWk+vmEkRk61SBY7V29PZMRKLmqeIeVWjC7ZQzHxTMOxdHvFP8nUK+Ny9ylgzi+fUkATrNHBFQKY/VsOiAacp1/hAwRMrS7nhty7umXPbPqxmR/eACVq1TSdrnr+kpm4Fvc4yTpvSRewnBXVhBnCQ6oVW9/xuZOzgKtwtou5sZa9dBNsZ2Q94kpcGMTzHRYRhX0osjwWfnWaY7luuQN2x4wfciyaDfDg//no16/am+wVdHqjA+2Wxbu28/gXPefOiPP0tkay5TePhHI5Om+S7of2LKpysdBB0oc+IXmiKFQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rvuK8DxyUxrkkCAmG2jMTD+HaZB+TROP82okwd1vkjH2yRR0tbqWf7JA51QgxZ/3lyl7URvxHH52g+5o9+U4TBxMYDfRc/ryO55liuQ0XMRKmHKl/FYha5s2xILtbsmQlVl/frFabTSAjfe/1oV5dOd+5QGd/nSAdGQZQH6nLHAMNS0SIxZhGNfjokvib7aW6JNyqotwvTJr8wNqU6wpA0P7Jk/JC3HzMa+vZ6+I9alhSiMjydd/nyhX4Q4h1DEH5CxJaV7Hd4Cb4Ykt7cZrW4t/f0sAl7hdR0zScvnvEPFcy2vS61GPG9rEdZGP0HhZNQfpiBBL+76A+fZ/v9Cd/681kq9Ot8ZVSQ4yNl5rlKA8zYJobnywnRBZzjcjVAFHfKW4twNVXp4THHzDZCHmy3LMaW3E+x/YvEcyaGfoPyh/YZu9oEj+UODY9LJVzIXJHVvewmnn1tyut+zuGbtvylu96f26hZbd1fkeIA/1DtuVtYdJSncNlWvsDo5j0ivp5/omOR27LoPfui6BOf0XzYZeenOpBpo7Bo9ULf6Q8JOTO7f/AVgkdTo77ufGu2zRNm+XhoW2zqMfeQ9ez+Q70TM7IPEJIhM6trjEYnXBwZ3bEEj317OY9hQowIENDRlvjP+hp207Wq0K0G+3WESlOQUe3OJTZ+JFnTUcMLi4l9DMf70GEZa4fYaS/YdDPGik1mY1C9g6QWCeOHwDYhDMYgEQuD77n3CPHn28rZs2aJD55m1hh2IFvd6ul02J3ffiRD0DY9GGz28MgzuK+SfzX+CKSGGCrETSRbx6M7lSBm6opulLO6RJleZ4X1E6WAHUgLldseJmfTzVorL+PrYLsfLDIDjiv22jkTgTmtrm3YW5IMX4+HrAxMg8lbw3L0xPZhWt/1vzpDODJMPVU/TSxtVhOJ3T1HbO9f5YpDQycwsPFPyi4ZZBpTElLquU5JPmy+5Bz43pP1sd3rwwH4DOVw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69dfe226-ad92-416c-fee7-08d9f0aab17b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:36.5091 (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: AM6PR03MB4359 Subject: [FFmpeg-devel] [PATCH 14/19] avutil/pixelutils: Don't include common.h 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: 3cFPDEH5Dm28 Signed-off-by: Andreas Rheinhardt --- libavutil/pixelutils.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libavutil/pixelutils.h b/libavutil/pixelutils.h index a8dbc157e1..7a997cde1c 100644 --- a/libavutil/pixelutils.h +++ b/libavutil/pixelutils.h @@ -21,7 +21,6 @@ #include #include -#include "common.h" /** * Sum of abs(src1[x] - src2[x]) From patchwork Tue Feb 15 17:43:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34321 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp512303nkf; Tue, 15 Feb 2022 09:45:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxb6dv3Y1OsAYh0t7uvyZ4tWSlVql6KPk2Zda0z4J6ZQQKr3b72RN5Juf31hq3mjv1Ijd0A X-Received: by 2002:a17:906:82c8:: with SMTP id a8mr188019ejy.438.1644947148868; Tue, 15 Feb 2022 09:45:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mr39si1654479ejc.82.2022.02.15.09.45.47; Tue, 15 Feb 2022 09:45:48 -0800 (PST) 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=BMJBswCm; 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 E1C0D68B30F; Tue, 15 Feb 2022 19:43:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069028.outbound.protection.outlook.com [40.92.69.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B0FE68B231 for ; Tue, 15 Feb 2022 19:43:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aMTHnVphPrb4gtJFzhbZJMGfy95gtRDbiHAGoSfZaZs/4Oi7Za6zgDUK3xmf6ZPrz7SQPsLVxlCxTG6dXTkcbBjPRBE3753W068E5SKudRM9L2bqBQhA8GWtr+P6e5RPCTkOydoMQ2usnqOPJc//FeCKDCihiTrTtPz8gd26R03pWNmSwSV7/kaXYSBHf7MF2AT6L8U0qH7dGqudxol8Xwn12Gu69n6dgcOMnKNDNJDnKg1ebJ5gljix3IVvg9qVeMH3XGIfRPUJ4S3hMrM1UR+wlLDOCq/bnvkQAZAfvQxyPwX4uJ4i/2MQO1MppOfuLaw3QKAIUGKzMk6l/Ff9rA== 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=K8nyNtZ6e0RZmgcwqvz3tN2ng4ESF/qSBlbodI7zxz8=; b=Lsf2bVt+tOTVQnEOZs1GB1f5S23BF61VEXzJ3CVRGgoZ3YsbnntbyOW20NHscXhtAzZlW1s3+CLPoXeqdL8vv69Mogorf4rRblL6oaPSCPc8/IgZm0cCghnIJ1jWSSJ1yA9hjCrPRrQd5/jRdrM4/L1Uh/UMBIrIIYIRlXc//LsKL8BreEWax3/iOVfsc6fQUE070qRUvFs4A983W8DLcrIXIkvHucCvHWSKXmy0Vu7xwDPAlEdmwosR8fSvWYW3meDGxHzCpEs3OE6taiKpBGdcoymGiEN3yL+P/G4dIfv2F53bLTZEeK3vtiZ/qI9KEWnP+jlrB56XCva4jgOGJQ== 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=K8nyNtZ6e0RZmgcwqvz3tN2ng4ESF/qSBlbodI7zxz8=; b=BMJBswCmAUu670dB/VmnTtJvsSww7+EjoB4tP9V9XFT4bM96Cd+tHghNOZYvS3q7MVesf7WuQRKNm0Xwm7PFU48I8Q5ecBAX3tvEPeHiaUtjB2cpZ8sUkpJwYa6mCXWCTG/RBdG++hCdUWm1gyw+bH9WpRLxh+wOaMBZsbrYo5LPjDImUk/BCfcnfTH4FYQV3KPb3ZvJTcLlteNGpf5PvbwqVthWvYuMSjGArU06KMakQfxSls+0yIHdrzPn5zbehO0jkR/zKWX6JH1RF3SLbDK0RfMFhSlVgxRHDSxuqTxvn92RoRjZB4xHgDKvPx+fpki/cxLgMnOxmR4Si4kTqg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3138.eurprd03.prod.outlook.com (2603:10a6:206:17::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.15; Tue, 15 Feb 2022 17:43:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:03 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [fzqRvILRbrIY6d51Y1TGd9nbcvd8aTHL] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba708ed3-787f-48cd-a0a7-08d9f0aab227 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlegDCco+FbLAyinoTy45KdowoTBTi8VcvC4HyJTCdlsUuHSuMwSzXhzOCNJNop/dItEx1plGutRKJRwChsM9E7pw3pwL7utW+3O3QoMlaCicMwDxry6a/3AbQGstmXK2Q3RsUb+3LN4SsF4Ja9XJWBpG+NZPbpnGlz/liIkod//DNIRihvdPu6kAQJbsrMqc42o3ym7NZdVL+RL96/HkL80SM7vmU7LWVRqfIe9ZrHcBw4m1kmzfdwzGBgNvnMPejCVp7Hyh8HvjBXfCz2LPpBMdOBohj+I7CNVCS5iUMPfnKjvry0YquzXj69t3mJjf0e+2ug+fxdCSJ2PEvpGbS9BGiKca7US8tASolltACVBlk+Zb+kjlHy3VHUQKwvFKcIq8Ao7A+qw2pfKMe/8t8AgpLCtg9DCPVkTjmqr9heg9+T1UTTBKfv1KehwR6NCcjkegB8SqcZ3sYPWnqB19MyV5eE8VzJFW5SKnVGAzJ2pRWbNj6fhlOg4RNLRlYgiZltleJyGqlBJRZVFn+dbEIhhAkqwU6/Lx4LbVp18eo6w+99Gku/RYmo5ogs0Qi2PDV1jwi8VPOnL95DM57NF62WHGZI5Aztjz7/5xtaiLbGQcFf3kqBuoCOmyhI2nPViTYj6PFbNd50ycWH+SqltOT+mOgD2mBEvWcsTg3DXwq2hY7h/YxACOJAlvnv4G3/SZsp7eYRJ8dToyvxwfl+Nkw4zKh9Mbxfilu58WRAg4838E= X-MS-TrafficTypeDiagnostic: AM5PR03MB3138:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hrM6wQxqib0QvVk1eufaWsMt1Mn2KKWYrHoQ+EywEobcfexP+ByDOCgfPUNNioG9fnx6V+AlIND+5mGnwv0tU9ArMrjKpnAqI2g7nqh6y1BZDMAmu/K7mwqZ4Td+3ihNHtn3sn5E9GVDe7Nl+qTzLtpYGPre0dtyM2oEy9qGsOE/B+Gesbsb6e/fl8W5/10rY2JEMulnSAmhBvKAhYSPbYjzgOG9INw5sjscCZl2dMLy7DjitpbLykqRIdaFD4UP5+2Biuc/X87kaHmvgsX9GieRL4e/WIoVTNXIn5kO9ixzdIkNqiVNBPly0Rr1ZNzrbf1vSxW/lNiVgUA+5yj0xLe/a5asTN4uuDw5WO4l8QQRdIlxos7mc6ddHOFJDz6rvh8I20wgfCjAw2zSdvLDmBBSNOLlgviLCNz6R1YdjeZRlh9RU1w2XPpXHvSB8cKifLgUDmehjW8F3YlkMiF5TG1v8CK376d4RV3oNehI5al9d7iHK99kBgNnXy5sgaAGCyNjmV16PrFAQreaNwC19Q6zgjXHjh0iextE8K22a0o58fS7z/P3sIQX6XtPQ2eqOvVVHA1q/xb+35R8eJ61qA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: R3N/m3P4z/lETpjRjgYP54Z8K8VuEXwwpyDK6xIvUavas/qPUDco9QAogsJowTqNISSlG//8O+jdb5wt8TXeuhavbZdcYTHgTiFfBzyGDIzOKcw7eSWn1mh6O8XRL0ThAv+IITsvRKfQknr+izAc93J9ltpLjicDDaBB5iUPx046btg5zxGVSd1K/Z/JrGV0z4TZczQLNNfgIT3JUCZIrDmmL9h+5baBU4mFWqmZvi3KN/ft/GRlPz5iuYet5SI9bI78F5F75EIVLRNFrNi2pS0jluB8dsztTOlX40EVaCwiYCkvsg5ttrXt5rt3wxIhiIeihQZCiFRt+HYuoxmwamJz0GMDwb75E1LIcWcy7yh9rqo+gEJRMOjnuY8958v4Vkwb+DbdcxN9bzfAnUymvkwDW5HMNmsHDquuMzs1tdRRlyKZ97QvWt5+itCU+Zc8TXk2hELzmj+wenkkSNty/amX6iPTObA9OjRsCoE4vjCsXd2SqlSWm8/7fmFtQJfhCtfYR6W6f2LWiVKyjIDEABUmb0p2mjX7dPQek2+uKUlbWfJg88Zjdxp17S1n3sb6ZTPruLcp4mlEOhl4/jTFuu/Ua+uBt9WkKTaCDFk8G8bVOCwbwHkkcg5a19tmr+LLmZaNVsKPkEkLo4ivWefJ/WY4DmA4ps6MVs565XGSoUnaM5ojj59xQfswBPx5tzgzRh5NIChiepafJu8QkfgZoklKieujKSrA4FG4aKIQD81cFL0in9qAtcVFrlgxPcbijA7kY59F5H/had4iuGTtPAK/ercsTzEiDRgqYgv0fTSrAz5omfRs0SXsoWoRecWBtrIqhvq2TYe7U/YhjW8capn+YIY/J+AWNH73ujacEMKxQyljWFE1nM7xZbGkjg1+i/65//xEljodLXcu2JJuDwQTyJR7MwoC8BrEMgFWKm7vu+mBBgDpRqq+vsKyXpDMGQCPcmpCBv2cqT8go3vj+A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba708ed3-787f-48cd-a0a7-08d9f0aab227 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:37.5714 (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: AM5PR03MB3138 Subject: [FFmpeg-devel] [PATCH 15/19] avutil/integer: Don't include common.h 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: z5KMIRbFx3x6 Signed-off-by: Andreas Rheinhardt --- libavutil/integer.c | 4 +++- libavutil/integer.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/integer.c b/libavutil/integer.c index 78e252fbde..b709c6d487 100644 --- a/libavutil/integer.c +++ b/libavutil/integer.c @@ -25,9 +25,11 @@ * @author Michael Niedermayer */ -#include "common.h" +#include + #include "integer.h" #include "avassert.h" +#include "intmath.h" static const AVInteger zero_i; diff --git a/libavutil/integer.h b/libavutil/integer.h index 45f733c04c..2d9b5bb10f 100644 --- a/libavutil/integer.h +++ b/libavutil/integer.h @@ -29,7 +29,7 @@ #define AVUTIL_INTEGER_H #include -#include "common.h" +#include "attributes.h" #define AV_INTEGER_SIZE 8 From patchwork Tue Feb 15 17:43:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34322 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp512484nkf; Tue, 15 Feb 2022 09:45:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJw68LaflRpkz6DPWSwpPwsBFzNeZmGkEFmseen6oOF2kgNJrsmZfcSY623VSaUHpUtyuJmG X-Received: by 2002:a17:907:a41f:: with SMTP id sg31mr132371ejc.645.1644947159277; Tue, 15 Feb 2022 09:45:59 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p13si340309edi.45.2022.02.15.09.45.58; Tue, 15 Feb 2022 09:45:59 -0800 (PST) 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=KFXzzAtI; 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 CBAAC68B24A; Tue, 15 Feb 2022 19:43:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069095.outbound.protection.outlook.com [40.92.69.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8449D68B2BB for ; Tue, 15 Feb 2022 19:43:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KkJqnC0hmqvfjiBoDtFGGCXkpgw+Jmuqyrdvj/j/9KHxWWpKz4GTTgqH5KlNFYMlc41ufepEzc8euTIlL/gatAziKbDBZHZ7b5pVf3JJwXSafU9b/sfpVlEu3ues+Km8o9wH7kRkVs5CNVagcLjm2HT6Oa/gXqCBGLJTeMcCKj11F02vCKFX+gmZ2jchciVFMcxww3S6WaKJylFSvkap+UjKS0fT/tIWdzR0rH9Kuym2XJYBDOQeIgAVYpsGQ9YqAkdaYhG/el913y70rvLF8Ag8d7eDMS70mBE5EsI2Sqj4gcePuI0yb5QKDYVfm4NOY6AvKegLSnqn//AtR1IjDw== 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=VY9HpNt9XqnpAcMcrOjTUKc20jtc5MKPZbMW0SXio0I=; b=OlTj0KO6c2zDhyB/kcltdEm4h9Pz5LAWXm4uA/a9ZH3nHUO6Is2wI/O/AZ74EvShJN6RtXoRuSAHX8jfYk20lkkjNI5eJBO301EUEsB8qsrdl5Xk17U6X+pKeuyiIPUzh98PvLDcXKyqtiOX3ft8trkMuVUSfdJstHcQ2zKv1ZhYVpisqpi+ca+opjewmP79iMISuu1bd/GFQTybbHKY1/rszhkgdG99lOwPPY81fL4PdCHKe69B6tl2/Khb+WAmIC1+Hc9xkApuFsZlz8HcWCnk8TNkdW/Q+PXeBazBuNis7wxiWNvltxMlUSp7LU4uk/CrZ2LZu4jWRvye/k3iMQ== 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=VY9HpNt9XqnpAcMcrOjTUKc20jtc5MKPZbMW0SXio0I=; b=KFXzzAtIQV13NpJ9C2p9gE4MKeYSvMzmc9Si2EmMSd0MfmZGFKdkzjsHlUm4XPwjhbUQYEOA9B3RAnV86a8JzofzV2oLsb9jQLIZeVlgXfdGYUtmzuVzLTpwmeW9Qwz/ldQKqWqIoZ9AsEY+12zoZ3B8JRRDuHzs9mkyD30fjIZPQGVDUkHRzuqwVCEOWneMchs2RzTpsaODe6ZQ221C9eiHsi22efcEZAtWeYfCg/eyaLz8gqACQwo34R8fjgWkBWIPJHZtuKD/1g4ZlHkB5keBgaqHTTI59tNa4Jh9S79csIJh0+XrdlM/0+KJ+N5oYhJ7sRZzFnE5AOvvnU/ovQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3138.eurprd03.prod.outlook.com (2603:10a6:206:17::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.15; Tue, 15 Feb 2022 17:43:38 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:04 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [iJYeSxmEkolweE+KshNvEzN9MSH6lQbB] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57efe79e-e22f-4341-16a6-08d9f0aab2b2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlegDCco+FbLAyinoTy45KdqCH5J8yXeU1D3xF9kcXykrbdJImhyMudYlWIMnw1eXI/1PPS9pc+AcnLN3KJB17H9bSGLCPtp7T0iwzjKD7pGoKQQs1+l2yaTJKpA8G6gBn7xCBL8NoNnu5FDQ8btER7t1x/azETYrv85dMvD1s508TdSZlHlq2GwLlyhQjJ1nYzOUM07TQxmGI2pXVdLLN6zxYzP/jt6ETezDPwVtcgePGqKVkaby2QimpOGAiuc8FWsbINzLqh8tKUOrpo613suJZEpWwg3YgeV1Mb6vJonTMcjtqW/0PlBPWi0oc26KNmS1XdzAkgmwDyCoMAGMyM7sbXr6k7BqqaX7+wIg4M8QYuTKrMN+1YFME39IL5+YaAyCsOqII+Z5aW4e/FegyQMujiR11vz/jokuI/ApdXXz0m2cyuWk27ShcO73i9hDCPOO4XJDIQzodDaEOJglYEFtyWKxJdUqOlSJL35aVHpfYC/gK3EXT92EderzEm8S2y97B55KuP8cQvxqXTtvKK0oawVPMgcA9uONHkzJmc9nPdiy+zElNGWMEuWKktoHdoEJ0MpARLq3sobPzoSx+UUOt6qRAQLUQFg/XmQxVgC08mYRhwGylMTIY2XyCUTrtTc9DDT3srGsehF+S2RQso7QI2qoHCVmh6BW7HMY5PHA1H+8sEiycvmIaxI/JIrEybvNRlcswq0+uzE/yseNbXXGZGBoYE5sNeFXCNOA+yGY= X-MS-TrafficTypeDiagnostic: AM5PR03MB3138:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JOQriZed/jp2um7csY4fB60bBuPnlzgqiQpnLxObgtehxQcK8c7JThM+KSDMptDOuL8iT25rAWwUyEydYnBwkTKr7zoHXDFRXgPKvXFTGRg29WWnjYuGKLw0gIn2jSflJp2se0qwRFt0nqI3w4ITSppkzeUfCqakHPhNNKxoWzdt8ZYHP+/aPmhhRg+lLT5y66Ds7zxON/eu5Cc1UMvKxRSVAHwSa5bxU7SvCD1XFgoWxZSc6pyUFPC4hxVgBIduU5+zfxlL0jb9+3tLx/K5yPZjX2K1NW2H+MYigloUo4zCy0qx4a3zkbuEomKum6IRmpOniygf8ux8TYrbPBhQhmmwO5htRPfz5H1ghtliMZy2769FfA6gy7bavTWXS48MHVPdOoXXqsDoTFWylITiY0s8+NzykiLDZrgY/wPsByESLu/Sx5Q0hfY50sg/Nac1h8y5hEYCiBkl7XqYD1cmrjUoD95w8Kz5k7c7nMeBp6iDkkNJGgeGYdNHFM6SK7jI64QBm0Sofy8ftCxMPAcbsnKcPArnaT8r9zK6G0NMnQrECS+BcPAbplFsLhEi1ZXBGdguFuTWNgGL7851dmm4bA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kCxcZSLlraNCylRTX/JG2h87I41MvU2m38yv+VPOzmAX0ViXY7xwGQtWcEJwE1ZQwoSPOYNfNQX2+pkiXrRRbP1YUHW5l+0gHQtOXaXESPVrfE23GM8M4gSbNmBDe53bG9xpK6gMTELNPdzBTwH41NnGMhhVDjDrIgdlZqF4ocm6TRftbnLhAb3XGwuoA3senhIViW4RURhS2yOLqpzIg6DG5GVHrLd63fDOwdTnWomtPoOuVI0YrjpbeRfpqgLNS4CfBfhoHpYCWVENceuFUNOb+3lTo2p0t5UTGx79brf/RqNJQX8CryFh7CWdnE2SK83ZPI6h1DqcXcbD3FSysuDXZE+soxWgoMHvSyF/7CnkNhXCEzUaazC36TwCxT2VHWsjIYbbR9hZyD56+TD1XZh9czRewn7SzeMkfVUWrTaW1bBt7SEVoQkXtVZcdr+VPWU6SU9mnPkALRzD6RWGqSX89oSUhA48znf/OWIIWMiTHqyZRHJZINflqsH7nF1BfHXaRJCR4k8fM9Zh8F35dzovyl2xJeLaxwinRMWpMGLZYY1uzLaSlKiCWYROhkNF+X7fW1izwqCfRjnMRSjhMKAlOlKN/dBJyhouo+KGvggVmowlDSPwxuYNB2/3yo6SgnUjE9YwEy7E/eaRIoIyeU8QaNwtX1OW5f0M2jV52U5wTlMBPIcgmLN9+pNLvcX0De3F0W/ad1cjxlI/5GhLQAATWiqUadkrwmEPAOMXWWCidyK7/uSGsfuzRyLUUMlqCfbZt2hiI892YfaYWFZPweUDlaevFcwPpHIaL1lOtROqSwhpUNSAdaq9gdqYdpfXBhhPnDBZLAzFX8hLW21fz4827Wv585c52S3LGrzyuDeFZTeHPJgW+vkzJFA4BMvoxsCdao7PdrzMFmPxF+AhwxxdGnofLm2g/UD7SKtSDXrD9dZ+HvaCZsxR2tjoJQIorFu5iou3cP0EnZdxlpqUGw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57efe79e-e22f-4341-16a6-08d9f0aab2b2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:38.4632 (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: AM5PR03MB3138 Subject: [FFmpeg-devel] [PATCH 16/19] avutil/display: Don't include avutil.h 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: E9rgQVYuGWQO Signed-off-by: Andreas Rheinhardt --- libavutil/display.c | 1 + libavutil/display.h | 1 - libavutil/tests/display.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/display.c b/libavutil/display.c index a0076e067b..d31061283c 100644 --- a/libavutil/display.c +++ b/libavutil/display.c @@ -23,6 +23,7 @@ #include #include "display.h" +#include "libm.h" #include "mathematics.h" // fixed point to double diff --git a/libavutil/display.h b/libavutil/display.h index d87bf68425..31d8bef361 100644 --- a/libavutil/display.h +++ b/libavutil/display.h @@ -27,7 +27,6 @@ #define AVUTIL_DISPLAY_H #include -#include "common.h" /** * @addtogroup lavu_video diff --git a/libavutil/tests/display.c b/libavutil/tests/display.c index 893ebb5543..19b07fc15f 100644 --- a/libavutil/tests/display.c +++ b/libavutil/tests/display.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "libavutil/display.c" static void print_matrix(int32_t matrix[9]) From patchwork Tue Feb 15 17:43:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp512685nkf; Tue, 15 Feb 2022 09:46:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPYXN1ifhSz4XSyjLS/ZYl+8aMHis+hxsF8w3LW/QknlRDOLaEgOU7AaPZYA7rI90EWo0z X-Received: by 2002:a50:e68d:: with SMTP id z13mr10247edm.307.1644947172506; Tue, 15 Feb 2022 09:46:12 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h8si319293edb.84.2022.02.15.09.46.10; Tue, 15 Feb 2022 09:46:12 -0800 (PST) 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=BWFL2O0d; 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 B2EB868B2B5; Tue, 15 Feb 2022 19:43:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2039.outbound.protection.outlook.com [40.92.91.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B08CC68B2F6 for ; Tue, 15 Feb 2022 19:43:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NWU5PWMeyyhJmKe+j1FybgTpREWauE1+tVmhagD++dKShWrpcVx3jB0F3NcfQQEp0Gv6MheINQnb76Xn0gCQQJgts8NYTOhUIXzX7bh61A8mqvi9wie3FXN1hZ2tVs9qMUsY2/aKrQD1inWQMZMluI8qnu64c7yUWNQ/MC1VtF5mZiyIZKmD2rphP6n5sz5thWvhoefNFJBGAMjhSMaLhf/ZNPP35dqwmuId3TN+a6H1iUUx+WXR6D74n8ftKaSpSuhM3xIMOClozpYyvUl8egZXdzBt8MOib5WXdXr7/t5fxQA0EODIDwZvg7tUpvvGYJ3ZuyplI15eq3gG6Cp9Mw== 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=B22x7PdUPfEdFoDywS1OT8d8twfdb87abEypKJ0tmhE=; b=DZGF9E3rsOxM5K4Fq3oWsimW48gu79AsRdYuEw3NHgamWF+TlMksd+tOoM3IP4XEcP4phQJYNGIOuG2foL2ffsl8E3wTzma2uBF60ZJZYsgTEne6VBtiMXIb/Eb7i/k7KiS/YBweN8BnJPHQ2YZmgKdpsMaYjHo6CeBLiDlt1waDYBEI0IccJu1AVXbeiifjIhCMcxxgosC3vB8rrqOf1uVrLV5NnEGZ4mdSILzDyktVi6MdX3IEc04oY3+Mcomzncf/YeyAhVqy+ls78JBVZaGRyE1OC2WvBY1ruzH6VuLzZD989LBgik/9hfq+zSv8R2CHYVp/a0hy7ZYKLU8zlQ== 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=B22x7PdUPfEdFoDywS1OT8d8twfdb87abEypKJ0tmhE=; b=BWFL2O0d1xXae/zhgqOJ/h7bXKkfnV6ZRFmm2q00MyKEzqqHdQTP7DUFuZ15BgAsDcLf5J+EIutNcdoLp9O2CNhjVwDG+v8KJyt5qTuGIOaJzjOzCmOGp/adHzL4J1TzAri19WwvqBXXcuFSp4B0m9QFcaCANyVwMVtugwyucRmndqQHIAtt7SVNQ/8paQLLGPMjI/MPEpjM8GbgoLJHMxGvA0C8zISPSmJY66yTXvvabLnztpEgPzOA0hXmJEhb/NYM6b+eXc8bSaQvO2tOKoT1YijaMPbXtcJPpUxQymFGCo7JRSwzy+Ixka71677bmqFvDTJQszT35/wtGk8NRw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4359.eurprd03.prod.outlook.com (2603:10a6:20b:a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Tue, 15 Feb 2022 17:43:39 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:05 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Rn7OGznySttE2XHXE62SM4uHmSPk/bSx] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 079c8874-5283-4910-a69a-08d9f0aab34a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVKLwpMcprvMJKpcsYktiuOgA6TY5S1oVeh1N6NSKz25ov6IBLRdSht8phCN0rmL5hqRx0tHN9dAFhHuJ9T5K+AH3zO0w95G9+nApmLzxUiDx64RyfATav4cK9/i20VCCt1WU587DOs+rTeHtDjlkczMLBsLNaCVGCpNR3P/3nc9NxyXNF2mVItniuTPK5Pf9MZgMz0XANNP1GinYf4ZUSjZ1cM74oH1F9ZnakLJ5XLt3rhmCv3u0N9Df7lntIWPXwFw8RFit5OVWnTRvGsZR2BCXTUnN1qdTXXKClKWzC+9YkhCnzeLEuGFYePinSmh6a/LlmyaSa5yXs+e8KyyD3VhQ7nJCFvi6juGyV4yy+Fw2IExQyCLeC6vEVcgiDY+Zm1BPbZ6tgWtDNr20eNy5IkN/aYyISMUnavqPMPEtPtvk97ZavcC9FuF6LKdDXX2JdwmbvmYUQ7Tiv219nhhWeX/kXjKHGcdq9HouTKfknEOl4iPpC2xvQl1MI8MHLj34oLfGzVVI1FnVmvXUlCj+V3VVS11+zbfB7Wpz2lQ0Pbojzis7XKasGesh3riR1xaLfMZla8jVFpphLAE0K10yVuL1aMLRNJXPtQ5bdp6uaPCP+cW0AFi8rr3O/wjvK1kVIH9Vcb0W1E3bfIY124y+L8XNwCQq0rt34X5ctxf4onfNhj8CVoePDPm7QxVVCJBbx+fUdkNak3X82eN3ZhPFoKwTeX/stu4OY= X-MS-TrafficTypeDiagnostic: AM6PR03MB4359:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KkKhIJe2KIbF6N0Td1cRAC623gP3aCeSfI01Pa/6aH12ejm2GijDBZdSGw1WYU6xdUcBRMCkUOtX+O8alLNolpJt7pyl+bD/D1KTJiQbPdnlUiL6fpbtzw9dg90XTzKdVdPmOUArHABXffYUJqJWgqKDIBMfQ8RBFhQhSY460E2Kbtx38VvR7ta4+HgRWFWQkn6qHMLjcQjUbyXwY/MWwx1GfWJdF4gtpXia03jHW2GHODKJQrS4LcjNR7uBBnbW8OUSGcu6sPA8CNGzgxEgb8Ebt9gi4/zuCrNEYxiVkOoZPWaYq4Wv+Zl6Ma7D9g6r3pssRNoBYBmuPLJBEtWtuLnqWW8fEOOehtRb2freUm8gpva3EzxUFOY24lH6aunIBdUvU5QiC6RzZD7cbQFN743QrPEBXS/Zxg1QSp/vFTfEK/flSwHoWuLc5Vd6L9v42tVWV0Q587sYUADgvoSBL0Ty+cFE9/6auPMB1QPuDZBddW6/iBJ/ZM/n2bIV1we+UivJY4ozX0JnfAbmU0ba7yDciDZI24jX2MKkfxbGXzkaiHeCRfcghjg5iECD592lVf+Ur2GqrVp611k75eOPVg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lBKxsEPZnNs/4Yz5mdz0sskw8dxFhCtwQbXlJ9PX+dXanYOVFf9D1R4PHHm/r57VM8QuB9TlTKyoiOJDhmbqXZGKPgsBabiWFQsvaY8xqj3R4Yt8igS/QmS/tNyAOPukw5otkHTNxDSmQSgpGnU/3dFmDohLXo9YkNvT5OyIRzaJtqGdGWQXTId/kK96natGMSKHzY9fID0UeQpWoJdgWzQtYT+GNX7wAf1taR02GDZaQuTJ5ZtQJySXHcjak3Imh6KDE+ba78TMZir+UStJrdOtiW0UcFnJcWLQ12O3T1zOOTLT5bDrZp2ZeqY4WlTEzSVqdmQfC8PZ+aitvE5456QY4eFpjGaP75JGYE/IeI4i75fOMf7YyqINugqCsa3+lFha3lJmbMkkGi/ADpkmSBY8AIopCZTSM47IZjFnoVWo1voq5nv4jdg3qm5Z3OXWhK9Ec5YP4T9coXi6H//2luIqvDLoyOtbYKpNh7gkRn78hFM+5iPVo6hz6hAAQLh8AOG8jisb5pwFbFCsGh3rD1yrZ0YKkgg9YpUWz4DnsAHwniYRQ0+HCeP3CF1C7tp7I4utnK3QNjxiTwt3s00AnZ8IANhnYP0ndSwzU2BuyWynhaoRFm/GVH5Si0phP9aii+Gd4oCtJQakaVaQPdLK187qV1B9gnwWCqGCPMNxKwLJejLg2MY7HnTnb9grYgCCQF3oeN5T4LAlEmikvFL8hUexs4OuvUA5w/Oo77jrLwdqnaA8OOLidz/vUIDNPgLlHuOVidysorHMPHZEqGZTRjv0lN/XWvCXp5117TAuLcQ0+t5QsAsVmfbQK6z4cu1X/DZhUWHeQzAYP+APJGf3bJQXPV4lNroYzNeMIWW+OQJWq8dccVkf4SU7RjXs0ZHpeqy8lOUqhpYfRKTvmS3vaSwJVACTEz0fpNRn/lqfNynFQ3FP/zW8p1DgykzWcezlhZ8YC5KqlHBVWtIyHLTbcg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 079c8874-5283-4910-a69a-08d9f0aab34a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:39.5268 (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: AM6PR03MB4359 Subject: [FFmpeg-devel] [PATCH 17/19] Remove obsolete version.h inclusions 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: 22IwwXyi6DW7 Forgotten in e7bd47e657bbf9e1ce9915e93bc80cb1a29fb7f3. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 2 +- libavcodec/x86/blockdsp_init.c | 2 -- libavfilter/internal.h | 1 - libavfilter/vf_swapuv.c | 1 - libavformat/url.h | 1 - libavutil/common.h | 1 - libavutil/internal.h | 1 - libswscale/swscale_internal.h | 1 - 8 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index ccca78d281..bfa43b3c03 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -21,11 +21,11 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" +#include "libavutil/version.h" #include "dirac.h" #include "encode.h" #include "put_bits.h" #include "internal.h" -#include "version.h" #include "vc2enc_dwt.h" #include "diractab.h" diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c index be3eef0021..d7f8a8e508 100644 --- a/libavcodec/x86/blockdsp_init.c +++ b/libavcodec/x86/blockdsp_init.c @@ -20,11 +20,9 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/internal.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" #include "libavcodec/blockdsp.h" -#include "libavcodec/version.h" void ff_clear_block_mmx(int16_t *block); void ff_clear_block_sse(int16_t *block); diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 1099b82b4b..53883101a8 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -28,7 +28,6 @@ #include "avfilter.h" #include "formats.h" #include "framequeue.h" -#include "version.h" #include "video.h" typedef struct AVFilterCommand { diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index 27d083f026..4452028262 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -25,7 +25,6 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavutil/version.h" #include "avfilter.h" #include "formats.h" #include "internal.h" diff --git a/libavformat/url.h b/libavformat/url.h index a129150d76..3cfe3ecc5c 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -25,7 +25,6 @@ #define AVFORMAT_URL_H #include "avio.h" -#include "libavformat/version.h" #include "libavutil/dict.h" #include "libavutil/log.h" diff --git a/libavutil/common.h b/libavutil/common.h index 3eb9bc5f74..fd1404be6c 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -41,7 +41,6 @@ #include "attributes.h" #include "macros.h" -#include "version.h" //rounded division & shift #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) diff --git a/libavutil/internal.h b/libavutil/internal.h index 0a7f1c6257..79c2130be0 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -43,7 +43,6 @@ #include "dict.h" #include "macros.h" #include "pixfmt.h" -#include "version.h" #if ARCH_X86 # include "x86/emms.h" diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 3a78d95ba6..2be23458a1 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -24,7 +24,6 @@ #include #include "config.h" -#include "version.h" #include "libavutil/avassert.h" #include "libavutil/avutil.h" From patchwork Tue Feb 15 17:43:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34324 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp512860nkf; Tue, 15 Feb 2022 09:46:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8pbCit5JMq+MPtlcOsuTOl7yS6HTiLO0xsEamGDzkbjxuJLmxbYihHkE5gfCBcDVDwZ2P X-Received: by 2002:a17:907:2d2c:: with SMTP id gs44mr196073ejc.54.1644947183764; Tue, 15 Feb 2022 09:46:23 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y4si22464002ejk.541.2022.02.15.09.46.23; Tue, 15 Feb 2022 09:46:23 -0800 (PST) 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=XTldVSED; 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 B97D468B2B7; Tue, 15 Feb 2022 19:43:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2083.outbound.protection.outlook.com [40.92.91.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B71B868B2EA for ; Tue, 15 Feb 2022 19:43:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SvI9M7BsMhdWS9+E5Vq8iKxJ8g8JgwPgi/zFXkONq0i5+JrTzyq5Bf53UDfwg9AR3zxy9bNxcWcNVuLYokGIYmm/eFca3UMN00NvkER5kHnkHIek2HH4ZH+mcRrChbjUlBMvNAuVWh8ai6xtLuHzlHyN4o4OADAZW+Dlh75socO77Pxdzs8S5BHIXbVtzdj2VRfc8C+wEE9vGinz0jhcvatszPyA6F6dXs+5yhPgbrWNCK6Xs+qf6JxBBW8l40HhYI3NEWf4Gb6gOL2Tn7zf/8JvFph8u65wSgB37Q2U/2BcUDoWm/4Vd+IvXmeTU3yrU8OgV+VWINc1ZW42+CSN0A== 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=UglRr4PwtIsgiWJ+pR0ZM3LWQDld4lyuhr4kPrhg9uI=; b=ONYZ2VOcm9VtSTln3i5cwVJuupiRw6sFlKoNAtDODGgt9JpnaJi4+RYfnQJS57qYJuvm0/AsPC9I/oNvb/9pAtmhBYBvUtTYVX8M1fm8uumqXXKezlKOocl9d9v7v9Pp71lakESQ3izGdWFF8/qqp/lu7pXqIhPjQywifMH1ntxameD5yeINdPQL0rwFZQhUWgcsINNcGTMm0Fuhj3pUjKEf3K2WCcQj3iV9SkMccUPMRp+UmDWyk4QjbBr0Nria/XUke7UUPVLF46Tx7vwUl7Fp0ollGRdQKCRGqqm8U2bHQP1crN7/eO43t9ECmBNbjPd4l4qV7izcT+p8bbFGTA== 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=UglRr4PwtIsgiWJ+pR0ZM3LWQDld4lyuhr4kPrhg9uI=; b=XTldVSEDSHJwotzPJsIBE9QnAXoBLIWbRLGqfN6gQAyG59k0sXkSPDWGee78fiyLWR/+OFM+WRgy1OkzJNaYT3JLeLXQlhqb+qCMiTDu9Km9eu/OeswzSjNxgF0GeJSqDNQ7+i5GY693pye2xOcFno5WAZ4WvmxDGgGI8z8cqjwMYC1n+iLXAgrX4y5GFQc5+Kh15K307kQgkn0aQMv/M5air98jk9cH3mDvMz13/ZL+OYqL7H/5VYagru8WFtbbg9XmENXfrx6OWq5jg5Qbd8Ic77AFA6eYQpiH/UfKoM2NauzJEhTTe24rakYWU0LDfLsQ9dCTuUgXPz+SxVqRAw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4359.eurprd03.prod.outlook.com (2603:10a6:20b:a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Tue, 15 Feb 2022 17:43:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:06 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [L6FKrcghR9HpoM45LQnzFYIbS0ni+xeB] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 353c9778-8655-4437-3228-08d9f0aab3e8 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlITuj5xFwkM5cslEvli2LUTubzCMo4IHbIna1cIrXHn9a0+aHooZRtpq4YXG2RG8dGn49r0hMpPGyeWXkzi/jO3s5Asv3grQ0ttWQCgBywleDe49FbF/yjFrtBSm/kZl031iPaUSIZ1cFFP9tTNzur2fTkXJX9oYnkEXgIQ61c7GmxyojvOsWmgXXnW26NbqvwnussPNxw80kZkK6kqytBwToGgx6dx5eDUDxvviCjCEXZG6v2pUoC/k4E94IEPjliMLDzjDSh/o1aFWSPPI9XQei4XsZnZ/VAp6PB1yZwUyn9vNyIJdQdweYyBGmF+GOYzU60cx6vJEyacI/y+xaurRh682tbxnNp01moR3e6S+y0z+X+4BYGTm5LCh9vFnc6M59VP7f8v1zfZfNtVWgRYegdRJ1zKxf3Fb7M8c4Nr8oCwTVsk5QhAdCBNi9epfmjke1J0O6Soc3Go7d5c8ftd8OJpELxSBR6NgXaWugMWF3S8mKy9bwp1XIlLQkmrGOIaeQT7m6Pao2e8jGsZTqlyPFKInwAAYvanoFU2bGQZsRg34xzdMTOX/ETZz4598al81voHB7gHfxzM9jeZnTbs2buIIjg9Xx8HksWvbsIft50QkIqLnfHaIgCc4cgAaBraC6LkJ//hhmx3DAT1eG6b30XjfrTIY7A9F0YxEp7/2u42nO48YMZVMd+xJM8CgWZ46Ze9T4cb6fe6kVLaN570IJqDphYndWAadr5R94bUw= X-MS-TrafficTypeDiagnostic: AM6PR03MB4359:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oUsJgzgZH4WQf99C6BCSzhsQnL/Rqu6yzZ/uerF4N8E5JpAWH3a4l3VolFZy3MxM5F7r3fliqnnwhZY6mWHYpPLf+X2YTnaYAebe4P+HhSb7Hb/J2xYcDBlnzEAOgjSpOfADKB0mputMU83Qrxskxdc5DFmo1hB2cqmxFWJX+reb5EKtLt5bPlu2umYyeM/8+Z077eIdK7DVhUjZwgjJ/ZWGcvL8XuJ4tp2+v7M3kIfpT7UsxjGtUKwZ+0HW6Mnrh/KqgH+W3YK5ybSsYoFfURSdO6noj2Ls6fTz1wQAG0r+2PN07xRYAkN/VsS8ybJ2pbKEEwnmjB4a6nS8vWF2e3gRjzpdsqugcMoYOTMzNpXe3E9lOIiPeYrd7kD9mE/C1n1VCaFoH5LVVMInhAkkNUgeW/jquTJmMk3eZ+p32+n1ybyc9uEiBwRud4GqbvklqeJEQARXRRXlh+Sxim9As/bfcoI9SFKg1T9Bvn79a28aHY2gupt/h3Y5OEauQGIok0iroH+64ogH3ol6BkRYC8YWe3R8KLg+TuWkYlUndQ2rf8zLTdAT3jdGmRP5cYFrwqPNU1AWmBJ2whlrJJaafQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NwbY9lqtq/roPPTcopqWdzZKAQ0QLPfSrUvrqbZVQkkelUbK6jxv/9Dx4P59hlgF6DXCJhABHm7QbXCCkvvMRTSKJtQALWYxeuQSUbqRANd7Ny0mhKnA0lJUirLmLQhtAvAMJcIMUL9hoGHIK6b3leMoUNzscg7y4zhXTEoMgp+y19NIv+loMMdkZJxwcrrG4q56HvjPfhIGs2SRn0xSpA4GXfdQ3kO4cBclA+1XG13NMoUvCjjXM8YFTJZT2ZwVlErzb/qYN3zPRZ1h+DeWNrMoxMlAK+LBDVJ4oEKYmlhPpcFy/WNz6Y92OjmahF4RE4XObo4LBbBE1GMOXauWHv43JdODvp+zUpat43L4KSRMMyUAt8ffTu30HpABk75T04jHQkBkfIklZ5n6zIBCzCaaYy1rNYm35UAiz61iqkX8oqKzUzfe7AaFYfWzh7STDgq6U74n9VLEUSdScbMPzzJgEYP6ycZB9eFsV/s9qu4Q2FxTFIuf6ZlZr6AowFvlj8FywndVMQmPjEZ8IWgvnQRjQVILBur6HZyP7mUZFOIEGzNNYgapxDyEWu3o951FohdC1hcwIwhEEZO9kzB25OelmPTYbYIxCFwVI1BQggJ1G3kziF4Ufj22sS1I8NO+2Ycuj7Z2vUPjhx1BE567A+LKKXEHu52+8XvcYWrI0CateFcGCq/yJ2e9USTQ3f7IOEFWW2Kts43k4FZ3wJeQSahslw31REH2cpC2pYgMEzm0bqjoU//b5AiMm8OUCm8S7m1PDIA4hT0jv19xlrFNNSgFId+8TerU2/4N9l6sk/CypIzVxBXYBTUATQZJsHjAZn3K9O/I3XbpJF/QaBCm5rGJLTZ5Z2JnlYSCr5lpTLcoGHPGseygzJmRc1p0V16o3biKmoWfbm4ou4sCaHasl4zzVxSWF1QX8T1NyhE6DsoqSOH3NzgAV0OlVzoK5nFd81ESnW1R42E7z3XamJhqyg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 353c9778-8655-4437-3228-08d9f0aab3e8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:40.5424 (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: AM6PR03MB4359 Subject: [FFmpeg-devel] [PATCH 18/19] avutil/avassert: Don't include avutil.h 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: AfAg2ZnhWdND Signed-off-by: Andreas Rheinhardt --- libavcodec/dct.c | 2 ++ libavcodec/mpegaudiodec_common.c | 1 + libavcodec/mqcenc.c | 2 ++ libavcodec/put_bits.h | 1 + libavcodec/rdft.c | 1 + libavcodec/tests/fft.c | 1 + libavcodec/x86/mdct15_init.c | 2 ++ libavfilter/colorspacedsp.c | 1 + libavfilter/window_func.h | 1 + libavutil/avassert.h | 2 +- libavutil/mathematics.c | 1 + libavutil/slicethread.c | 1 + libavutil/tests/aes_ctr.c | 2 ++ libavutil/tests/encryption_info.c | 1 + 14 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libavcodec/dct.c b/libavcodec/dct.c index 52f082d062..7581b3241f 100644 --- a/libavcodec/dct.c +++ b/libavcodec/dct.c @@ -30,7 +30,9 @@ #include #include +#include "libavutil/error.h" #include "libavutil/mathematics.h" +#include "libavutil/mem.h" #include "dct.h" #include "dct32.h" diff --git a/libavcodec/mpegaudiodec_common.c b/libavcodec/mpegaudiodec_common.c index a963f6683a..ed2de8adbb 100644 --- a/libavcodec/mpegaudiodec_common.c +++ b/libavcodec/mpegaudiodec_common.c @@ -28,6 +28,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/libm.h" #include "libavutil/thread.h" #include "mpegaudiodata.h" diff --git a/libavcodec/mqcenc.c b/libavcodec/mqcenc.c index 6d0368f827..a8c35c8db3 100644 --- a/libavcodec/mqcenc.c +++ b/libavcodec/mqcenc.c @@ -25,6 +25,8 @@ * @author Kamil Nowosad */ +#include + #include "libavutil/avassert.h" #include "mqc.h" diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 689c6b282e..4b4f977ad5 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -32,6 +32,7 @@ #include "config.h" #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" +#include "libavutil/common.h" #if ARCH_X86_64 // TODO: Benchmark and optionally enable on other 64-bit architectures. diff --git a/libavcodec/rdft.c b/libavcodec/rdft.c index 6ba7484238..8228eb247b 100644 --- a/libavcodec/rdft.c +++ b/libavcodec/rdft.c @@ -20,6 +20,7 @@ */ #include #include +#include "libavutil/error.h" #include "libavutil/mathematics.h" #include "rdft.h" diff --git a/libavcodec/tests/fft.c b/libavcodec/tests/fft.c index 9a5e5bd1c0..cc951b0dd4 100644 --- a/libavcodec/tests/fft.c +++ b/libavcodec/tests/fft.c @@ -38,6 +38,7 @@ #include #include "libavutil/cpu.h" +#include "libavutil/error.h" #include "libavutil/lfg.h" #include "libavutil/log.h" #include "libavutil/mathematics.h" diff --git a/libavcodec/x86/mdct15_init.c b/libavcodec/x86/mdct15_init.c index 641bfd043f..31ce19d31c 100644 --- a/libavcodec/x86/mdct15_init.c +++ b/libavcodec/x86/mdct15_init.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "config.h" #include "libavutil/attributes.h" diff --git a/libavfilter/colorspacedsp.c b/libavfilter/colorspacedsp.c index b8ba5c06e4..65ea74c584 100644 --- a/libavfilter/colorspacedsp.c +++ b/libavfilter/colorspacedsp.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "colorspacedsp.h" /* diff --git a/libavfilter/window_func.h b/libavfilter/window_func.h index b7c8c00270..bff1fa6041 100644 --- a/libavfilter/window_func.h +++ b/libavfilter/window_func.h @@ -24,6 +24,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/common.h" enum WindowFunc { WFUNC_RECT, WFUNC_HANNING, WFUNC_HAMMING, WFUNC_BLACKMAN, WFUNC_BARTLETT, WFUNC_WELCH, WFUNC_FLATTOP, diff --git a/libavutil/avassert.h b/libavutil/avassert.h index 9abeadea4a..51e462bbae 100644 --- a/libavutil/avassert.h +++ b/libavutil/avassert.h @@ -28,8 +28,8 @@ #define AVUTIL_AVASSERT_H #include -#include "avutil.h" #include "log.h" +#include "macros.h" /** * assert() equivalent, that is always enabled. diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c index f4e541fa24..b878317d63 100644 --- a/libavutil/mathematics.c +++ b/libavutil/mathematics.c @@ -26,6 +26,7 @@ #include #include +#include "avutil.h" #include "mathematics.h" #include "libavutil/intmath.h" #include "libavutil/common.h" diff --git a/libavutil/slicethread.c b/libavutil/slicethread.c index 867ce32238..ea1c9c8311 100644 --- a/libavutil/slicethread.c +++ b/libavutil/slicethread.c @@ -18,6 +18,7 @@ #include #include "cpu.h" +#include "internal.h" #include "slicethread.h" #include "mem.h" #include "thread.h" diff --git a/libavutil/tests/aes_ctr.c b/libavutil/tests/aes_ctr.c index 9dbf0af8aa..486dae3348 100644 --- a/libavutil/tests/aes_ctr.c +++ b/libavutil/tests/aes_ctr.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "libavutil/log.h" #include "libavutil/mem_internal.h" #include "libavutil/aes_ctr.h" diff --git a/libavutil/tests/encryption_info.c b/libavutil/tests/encryption_info.c index d489612b7d..55c668c6d5 100644 --- a/libavutil/tests/encryption_info.c +++ b/libavutil/tests/encryption_info.c @@ -22,6 +22,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/mem.h" static const AVSubsampleEncryptionInfo test_subsamples[] = {{1, 2}, {3, 4}, {5, 6}, {7, 8}}; static const size_t test_subsample_count = sizeof(test_subsamples) / sizeof(test_subsamples[0]); From patchwork Tue Feb 15 17:43:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp513077nkf; Tue, 15 Feb 2022 09:46:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzD9Vc5ce/6QT1Q/wcnrEL+jrFcESHxRjIvvkeLe0J0UfyaPWfAflUeUDILMpPoyxLVrV9x X-Received: by 2002:a05:6402:2927:: with SMTP id ee39mr58372edb.252.1644947198767; Tue, 15 Feb 2022 09:46:38 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w17si12931432ejb.848.2022.02.15.09.46.38; Tue, 15 Feb 2022 09:46:38 -0800 (PST) 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=SvGlXlJL; 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 AF94768B2BE; Tue, 15 Feb 2022 19:43:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069070.outbound.protection.outlook.com [40.92.69.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6619C68B305 for ; Tue, 15 Feb 2022 19:43:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=InfsP/EJ8slyJ227TSanozH3OQiIh7D6WLLcKL7GzQCU0/EvABIzSDXlvnnjTslyWP99l3GCX4//egcW8WtzCnfQRN4c1LqfoMdm0ySnZ4sl4TMiMhnuxw3X/Vug8g6vxaqJPB35F9PtrwtsXBfQ0h5iBxuQhs9GOA4uugKF+Et/ETpS3BMZ/CgpR/LhV4E27qb97FK9TsgJllUWo55zayd8zX0A9IAMOAYa1pdyGH544cNlgiD3K6pkl6jnxVCAw4OuJp8FdsJ+t1SO7AkLyU2CiogCVUM0P/Gy7ES8XEwdZfZFCo6fhy0ke4E/xobnHyo13Jl+WVe3/hlKBo8FNQ== 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=Bk6Gft10ODfVPQF4Cw6oCVPFOTByHW7m4pwF+vHieh4=; b=cDrbUHw/xTWM+2mo7wlQ9v2pF2hg5n+p5r76AhsuRnr8x50ahaz8lA9vfJxAT+gfflLC2XH7zvu0v7tgjkIlrEnYgj6C7zoaA9AojBBuNTzjYtXv3NgkQNCodBzzu8y2QxcFZCY1VnatNO3Geff1zy3e0xC2LhbG9JVKi2E1CASe3+/7+56nkUCBZ+oVFJDcnSrZfeav5g1eUnX67L/5qtKQ8XjhYQmWC2sz37Nw+K0Q4jM1MjAx95dS+O9dHG848bnKcj9F3tK9I6UZht59dN06k0be5vLleXlEWUaJ+CbLMSwPLJLTawxD8HRG7TuRCjZc2mrGxg6FjnIJaGPRtg== 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=Bk6Gft10ODfVPQF4Cw6oCVPFOTByHW7m4pwF+vHieh4=; b=SvGlXlJL7SqYG3PvHw3t19McaZ7BeNXRMyIeJ2AQgEK7CeA7fWr/D57oJ2vCoNvwQeuLPZnFpEmnSpmghOPevut4z/irYUJ9birwMmIREmJ0U5gJXLWUUj9rBBuWiwm0KqOozuYCQEx6GXGn3pxv0bx1p4rdDD1CFOCYEc9LO+GRzL4v0xSeYDAKuxtK3UsEcI8Fuf+JK5TG+Kvoc8yWMGHpJY1QlqFuv/hLFkpAmq714xg8CXDuVRNm/nLb2y20NMQCWIqDIWxhSpSLYw9N1mf9w5C3tTbir5OdBqRmQYxlNijbouZRkidFJUZ2mK/vk/ANSou4TP4FDUmRjjXrHg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3138.eurprd03.prod.outlook.com (2603:10a6:206:17::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.15; Tue, 15 Feb 2022 17:43:42 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:07 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VzyPQe57m0XXngYwM63kJdV4sD05HgKM] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c0e1a309-a1b7-42d3-f817-08d9f0aab4b9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlSSsHMeVlUeDYsiTKjotWFlu+TE75g81rP4hCo6aEEN1MnqTHs9pvm32LMvmcFR+llTy/oMfPzo115+1PpSRNvgBKPL4RncWSCIv02vumVJOUUcMYVCPi09vKIUhwWd0EZn36etxoS4x5s0T+d7wJf1hjaK78JkiIfvJarMCagqeFFFXBbVOsjTvktH+y12bDDfIdGKyLkdeFlNMqTAziaDBRKgZZoYq9PZy7T7IOjpkOzL6917RHEYqf6jgnOs/DpytIBCZlsc+EHBUi70ZDV3OR+V1XUXSSQBymcl1tQm4y8K3NlUCFtwxt8ACP+MdOHQccwfS85S+tn/f0W294CWML9LqNRr+Ksq+eOZtCq8eq24SWLv3SoiUW6/xNgHZiiahE3kwm5eoZmo/v7mIF5CApyY5epyh3ak0i1Lhm9DtPPRfTrCH69n4EZBCFWDavVc5adEezlvRkHI9Gta2E9J+ty89qTKfwxUCTmlu9eDEbkUzeAMlZPNNLojhSxDAI9jv5pjiLlf3Ot/RETygrBn0LI7NRhmv9dwuSX6kbQyGiv3XWaJ53J7oH+17qHBOUW1u/BZ+0YuQ8yzjKKsxbP5n9L3opfVsDD+YZzQw0BpechTOxn8kHwxW43e3lG23IbGUp7p4byKl9L3leZCOwWRQcnUuxPPK0jbFzjQbIiaZLuPYYJBtr63Zi3suuRlXEw9v/4m7mEP4zWiRtxAWAUxSztADYl7Jrt7Zstvc2ZcI= X-MS-TrafficTypeDiagnostic: AM5PR03MB3138:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5TcqN4kKN5h2x0KoMbWpsWKXj5hFXbiTr8xIPotpH092zOYrUuvD3t1SCXpkOaAjYyDcBmQsd+QMwvzUmkB1koVka329WPO6Jr+ogYImFfx2OqqruuJlTLeHgtpXikbu/oSk4qxNSATrrDPomjqHIC95N6EEV3mliFNfB5En5bh2EwjFeySSB0mDt3miORMZsDhmXlcMSINHcGNEBOZl5oVVG2Ues4sq6L/yf17ahzQO58MdgL9jK+93l2RGtF9PBmzYTd8hTTCEhE9PAtgCpYrIvd2otDU294tHDyf7QnSoKHCqOFJRjJe1/hmx5dU6EpPYE7yDzOJVk7voHddPMEQ1zlP6mzbzzHHfPLTmo9X38FJM7+VnYCAxCPC0dfbGhC3vLCuHDIoBOuVrNC90wli/GRj3gWjM0y6+4bIhIACE48fAXdceF7PZO1vvnFe3/GIQNPUbL1Py19oLuXgfwA6xAngxPtzrxUBMdgxnw+Uu4+IGuqCVce2Fr5zbGH+LO/m6caAsDk4FJvYO6exOirHy/XQmcs9G1eSfvoMlBTSxHV+jSfNldLfN9IPd6D6+wYXMw/yiYyxBxq/8iTia8A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TpqQxXc81dxiYOneaTcVmPOKJtrAqLOsWQPxBLIN55Rt8X3Z9MKLKNao9vybAZTnJYg9w2tAmVPP5xCEQ7kkP6Vd7IK4vZrmj40V0iMG1UiKRXSDna3oIfbmJuBVXS1XcuxXTwuJ3po25nKK/0q5jM6nmM8MF4lJurhx/Bab6/tfpHnWKrmgbYK7gSGFlM3aP6dWaCCyJTVLU2tQX4Mv9eEYbIQz4Y885MI8lxhnHH1IokZY6Ct2hPmHWPuCrxKroqtnV4WpBZaolN1sx2NeiTtOj01v91/48RPytmfyqGXebxl34pl2Fepi9i/CnEYY8YCGIrD8GOPPy0LUzyQlZT+GTOh8nK2BTHnl1sV/ZbXSDAVUkfMINOlsYaAFLI+PgPMU7LoiY+LUXbm84gTXH+gAmmbNuZmol7lJZqoUUtjXiKoDVCsSvcNVsF2ueTikaamoD6FJrM/FNdRjtk/AtthV9vNBMIKx7bLf26Is/EJfQIQB+1jSoUPcGHJCXe/L0GeZq/hR/K8ex1iYQW8NjTwRm+n6HWbXfyhpqHYyrelOAJhXADGgKQcE59XDLh6wiuBY+HXYMpN2BQ2E1OvK0tpB6F2lipgfBZEnRBnB8R4BRADAkOqSllmdhyg8VC4chRbm6iiKE8c0674ZeyZduo7V562HcHIDm8KOQ3UeQ49CgMnu66lXiQGKD/OesHixPVsqBNHCI663587AP1IznT08BPexRi1ReFLcvlWgy+MQ/1GaucNeGoEv63FUMgW4xIxpEjqkneOjFKM055N6PiBo4WK92qCAWRKN+a7aqLimCpYadwe9ebp0hETqzt3ZiK9ciJgf6pPZzca7vGn59+EAyCM55BswMoj2mcSxQUw+KiMlEhJHrcUeWArmDAGSu0Xp3p9VBQCWNYlY+V6Qn8SrUlgj3mW+qbaPPa7oDxqCIgw99CM4bHHSb4bkXwgA1cDAGR+euGsMso7L3OWj0w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0e1a309-a1b7-42d3-f817-08d9f0aab4b9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:42.1685 (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: AM5PR03MB3138 Subject: [FFmpeg-devel] [PATCH 19/19] Remove unnecessary libavutil/(avutil|common|internal).h inclusions 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: jF3+2sNplmSJ Some of these were made possible by moving several common macros to libavutil/macros.h. While just at it, also improve the other headers a bit. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3.c | 3 ++- libavcodec/ac3.h | 1 + libavcodec/ass_split.c | 8 +++++++- libavcodec/av1_parse.h | 2 +- libavcodec/bitstream.c | 2 +- libavcodec/cabac.c | 5 +---- libavcodec/celp_math.c | 7 +++---- libavcodec/codec_desc.c | 3 ++- libavcodec/dca_exss.h | 2 +- libavcodec/dcadct.c | 2 +- libavcodec/dcadct.h | 3 ++- libavcodec/dcadec.h | 4 +++- libavcodec/dcahuff.c | 2 +- libavcodec/dirac_vlc.h | 2 +- libavcodec/dnxhddata.c | 4 +++- libavcodec/dnxhddata.h | 3 ++- libavcodec/dv_profile.c | 3 ++- libavcodec/elsdec.c | 7 +++++-- libavcodec/exrdsp.h | 2 +- libavcodec/flacdsp.c | 1 + libavcodec/flacdsp.h | 2 +- libavcodec/flacdsp_lpc_template.c | 2 +- libavcodec/flacdsp_template.c | 2 +- libavcodec/fmtconvert.c | 3 ++- libavcodec/golomb.c | 2 +- libavcodec/h264_levels.c | 2 +- libavcodec/h264_redundant_pps_bsf.c | 7 ++++--- libavcodec/h264_sei.c | 2 +- libavcodec/huffman.c | 5 ++++- libavcodec/jfdctfst.c | 5 ++--- libavcodec/jpeg2000dwt.c | 3 ++- libavcodec/jrevdct.c | 4 +++- libavcodec/lagarithrac.h | 1 - libavcodec/libopus.c | 1 - libavcodec/lsp.c | 4 ++-- libavcodec/lzwenc.c | 2 +- libavcodec/mdct15.c | 3 ++- libavcodec/mips/mpegaudiodsp_mips_fixed.c | 1 + libavcodec/mips/mpegaudiodsp_mips_float.c | 1 + libavcodec/mjpegenc_huffman.c | 3 --- libavcodec/mpegaudiodecheader.c | 2 +- libavcodec/mpegaudiodsp.h | 2 +- libavcodec/msmpeg4data.h | 2 +- libavcodec/opusdsp.c | 2 ++ libavcodec/opusdsp.h | 2 -- libavcodec/pngdsp.c | 2 +- libavcodec/ra288.h | 2 +- libavcodec/rangecoder.h | 2 +- libavcodec/raw.c | 2 +- libavcodec/rle.c | 2 +- libavcodec/scpr3.h | 7 +------ libavcodec/tests/cabac.c | 2 +- libavcodec/tests/jpeg2000dwt.c | 5 +++++ libavcodec/tests/rangecoder.c | 1 + libavcodec/trace_headers_bsf.c | 4 ++-- libavcodec/videodsp.c | 3 ++- libavcodec/vp56data.h | 2 +- libavcodec/vp56rac.c | 4 +++- libavcodec/vp9dsp.c | 4 +++- libavcodec/wavpack.h | 5 ++++- libavcodec/wavpackenc.h | 2 ++ libavcodec/x86/fdct.c | 3 ++- libavcodec/x86/mpegaudiodsp.c | 4 +++- libavcodec/x86/pngdsp_init.c | 3 ++- libavcodec/xiph.c | 2 ++ libavcodec/xiph.h | 2 +- libavdevice/timefilter.c | 6 +++++- libavfilter/af_afir.h | 13 ++++++------- libavfilter/af_volume.h | 4 ++-- libavfilter/avfiltergraph.c | 2 -- libavfilter/colorspace.h | 2 +- libavfilter/ebur128.c | 3 ++- libavfilter/motion_estimation.c | 1 + libavfilter/motion_estimation.h | 2 +- libavfilter/pthread.c | 6 +++--- libavformat/argo_asf.h | 2 +- libavformat/asfcrypt.c | 3 ++- libavformat/avlanguage.c | 3 +-- libavformat/hlsplaylist.h | 1 - libavformat/matroska.h | 2 +- libavformat/network.c | 1 - libavformat/riff.c | 3 ++- libavformat/tee_common.c | 5 +++-- libavformat/webmdashenc.c | 2 ++ libavformat/wv.c | 3 ++- libavutil/adler32.c | 2 +- libavutil/aes.c | 8 ++++++-- libavutil/aes_ctr.c | 5 ++++- libavutil/avsscanf.c | 8 +++++--- libavutil/avstring.c | 5 ++++- libavutil/base64.c | 6 ++++-- libavutil/blowfish.c | 5 +++-- libavutil/bprint.c | 3 ++- libavutil/buffer_internal.h | 1 - libavutil/camellia.c | 6 +++++- libavutil/cast5.c | 6 +++++- libavutil/channel_layout.c | 6 ++++-- libavutil/color_utils.c | 1 - libavutil/crc.c | 2 +- libavutil/des.c | 6 ++++-- libavutil/error.c | 7 +++++-- libavutil/fixed_dsp.c | 1 + libavutil/fixed_dsp.h | 2 +- libavutil/lls.c | 2 +- libavutil/log.c | 4 +++- libavutil/lzo.c | 6 ++++-- libavutil/mem.c | 9 +++++---- libavutil/pixelutils.c | 12 +++++++++--- libavutil/qsort.h | 2 +- libavutil/rc4.c | 5 +++-- libavutil/ripemd.c | 4 +++- libavutil/sha.c | 3 ++- libavutil/sha512.c | 3 ++- libavutil/stereo3d.c | 3 ++- libavutil/tea.c | 4 ++-- libavutil/tests/color_utils.c | 2 ++ libavutil/tests/pixelutils.c | 4 ++++ libavutil/twofish.c | 6 +++++- libavutil/video_enc_params.c | 2 -- libavutil/x86/imgutils_init.c | 3 +-- libavutil/xtea.c | 4 ++-- libswscale/input.c | 6 ------ libswscale/options.c | 2 -- libswscale/rgb2rgb.h | 5 +---- libswscale/swscale.c | 8 ++------ libswscale/swscale_internal.h | 1 - 126 files changed, 260 insertions(+), 178 deletions(-) diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index a0fd00138f..e1d0f12073 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -24,7 +24,8 @@ * Common code between the AC-3 encoder and decoder. */ -#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/macros.h" #include "ac3.h" diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 0e52028111..dabd49f4cc 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -78,6 +78,7 @@ typedef int INTFLOAT; typedef int16_t SHORTFLOAT; #else /* USE_FIXED */ +#include "libavutil/libm.h" #define FIXR(x) ((float)(x)) #define FIXR12(x) ((float)(x)) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 05c5453e53..73ef6196c5 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -19,8 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" +#include +#include +#include +#include +#include + #include "libavutil/error.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "ass_split.h" diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index 3861d80b4c..f4a5d2830e 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -24,9 +24,9 @@ #include #include -#include "libavutil/common.h" #include "libavutil/error.h" #include "libavutil/intmath.h" +#include "libavutil/macros.h" #include "av1.h" #include "get_bits.h" diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 2dd0226614..c948c889b6 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -36,11 +36,11 @@ #include "config.h" #include "libavutil/avassert.h" #include "libavutil/bswap.h" -#include "libavutil/common.h" #include "libavutil/error.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "libavutil/qsort.h" #include "mathops.h" diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 6649feebeb..7d41cd2ae6 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -24,13 +24,10 @@ * Context Adaptive Binary Arithmetic Coder. */ -#include - -#include "libavutil/common.h" +#include "libavutil/error.h" #include "libavutil/mem_internal.h" #include "cabac.h" -#include "cabac_functions.h" DECLARE_ASM_ALIGNED(1, const uint8_t, ff_h264_cabac_tables)[512 + 4*2*64 + 4*64 + 63] = { 9,8,7,7,6,6,6,6,5,5,5,5,5,5,5,5, diff --git a/libavcodec/celp_math.c b/libavcodec/celp_math.c index 920995a879..f4bbd158ab 100644 --- a/libavcodec/celp_math.c +++ b/libavcodec/celp_math.c @@ -20,14 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include +#include "config.h" #include "libavutil/avassert.h" -#include "avcodec.h" +#include "libavutil/intmath.h" #include "mathops.h" #include "celp_math.h" -#include "libavutil/common.h" #ifdef G729_BITEXACT static const uint16_t exp2a[]= diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0974ee03de..725c687b00 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include -#include "libavutil/common.h" #include "libavutil/internal.h" +#include "libavutil/macros.h" #include "codec_id.h" #include "codec_desc.h" diff --git a/libavcodec/dca_exss.h b/libavcodec/dca_exss.h index 208fae1b85..9e91b00bfd 100644 --- a/libavcodec/dca_exss.h +++ b/libavcodec/dca_exss.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_DCA_EXSS_H #define AVCODEC_DCA_EXSS_H -#include "libavutil/common.h" +#include #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/dcadct.c b/libavcodec/dcadct.c index 1082aa884d..a0eda3d2bb 100644 --- a/libavcodec/dcadct.c +++ b/libavcodec/dcadct.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" +#include #include "dcadct.h" #include "dcamath.h" diff --git a/libavcodec/dcadct.h b/libavcodec/dcadct.h index 518c9f9032..2ef60c16db 100644 --- a/libavcodec/dcadct.h +++ b/libavcodec/dcadct.h @@ -21,7 +21,8 @@ #ifndef AVCODEC_DCADCT_H #define AVCODEC_DCADCT_H -#include "libavutil/common.h" +#include +#include "libavutil/attributes.h" typedef struct DCADCTContext { void (*imdct_half[2])(int32_t *output, const int32_t *input); diff --git a/libavcodec/dcadec.h b/libavcodec/dcadec.h index 9da8d3b444..0f371eca14 100644 --- a/libavcodec/dcadec.h +++ b/libavcodec/dcadec.h @@ -21,9 +21,11 @@ #ifndef AVCODEC_DCADEC_H #define AVCODEC_DCADEC_H -#include "libavutil/common.h" +#include + #include "libavutil/crc.h" #include "libavutil/float_dsp.h" +#include "libavutil/log.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index fec60771ec..fa36735c0b 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -23,7 +23,7 @@ #include #include "libavutil/avassert.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "dcahuff.h" #include "put_bits.h" diff --git a/libavcodec/dirac_vlc.h b/libavcodec/dirac_vlc.h index bfcfa136a1..5adb9ef631 100644 --- a/libavcodec/dirac_vlc.h +++ b/libavcodec/dirac_vlc.h @@ -19,7 +19,7 @@ #ifndef AVCODEC_DIRAC_VLC_H #define AVCODEC_DIRAC_VLC_H -#include "libavutil/avutil.h" +#include int ff_dirac_golomb_read_16bit(const uint8_t *buf, int bytes, uint8_t *_dst, int coeffs); diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index cb3d4a4c72..d52abe87dd 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include "libavutil/log.h" +#include "libavutil/macros.h" #include "avcodec.h" #include "dnxhddata.h" -#include "libavutil/common.h" /* The quantization tables below are in zigzag order! */ diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index 861faca4ca..ea36feb0a2 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -24,8 +24,9 @@ #include #include "avcodec.h" -#include "libavutil/internal.h" +#include "libavutil/attributes.h" #include "libavutil/intreadwrite.h" +#include "libavutil/rational.h" /** Additional profile info flags */ #define DNXHD_INTERLACED (1<<0) diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c index 0fc227dd04..f403114184 100644 --- a/libavcodec/dv_profile.c +++ b/libavcodec/dv_profile.c @@ -18,11 +18,12 @@ #include "config.h" +#include #include -#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" +#include "libavutil/macros.h" #include "libavutil/pixdesc.h" #include "avcodec.h" diff --git a/libavcodec/elsdec.c b/libavcodec/elsdec.c index ecb5757066..9ae932cdf7 100644 --- a/libavcodec/elsdec.c +++ b/libavcodec/elsdec.c @@ -25,11 +25,14 @@ * Entropy Logarithmic-Scale binary arithmetic decoder */ -#include +#include #include +#include -#include "libavutil/common.h" +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" +#include "libavutil/macros.h" +#include "libavutil/mem.h" #include "elsdec.h" diff --git a/libavcodec/exrdsp.h b/libavcodec/exrdsp.h index 2c4dc3af88..aba3d3cf51 100644 --- a/libavcodec/exrdsp.h +++ b/libavcodec/exrdsp.h @@ -19,8 +19,8 @@ #ifndef AVCODEC_EXRDSP_H #define AVCODEC_EXRDSP_H +#include #include -#include "libavutil/common.h" typedef struct ExrDSPContext { void (*reorder_pixels)(uint8_t *dst, const uint8_t *src, ptrdiff_t size); diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c index bc9a5dbed9..6b6d578d64 100644 --- a/libavcodec/flacdsp.c +++ b/libavcodec/flacdsp.c @@ -19,6 +19,7 @@ */ #include "libavutil/attributes.h" +#include "libavutil/internal.h" #include "libavutil/samplefmt.h" #include "flacdsp.h" #include "config.h" diff --git a/libavcodec/flacdsp.h b/libavcodec/flacdsp.h index 7bb0dd0e9a..4a7a36064a 100644 --- a/libavcodec/flacdsp.h +++ b/libavcodec/flacdsp.h @@ -20,7 +20,7 @@ #define AVCODEC_FLACDSP_H #include -#include "libavutil/internal.h" + #include "libavutil/samplefmt.h" typedef struct FLACDSPContext { diff --git a/libavcodec/flacdsp_lpc_template.c b/libavcodec/flacdsp_lpc_template.c index 5d532e0673..dd847d3b32 100644 --- a/libavcodec/flacdsp_lpc_template.c +++ b/libavcodec/flacdsp_lpc_template.c @@ -17,7 +17,7 @@ */ #include -#include "libavutil/avutil.h" +#include "libavutil/common.h" #include "mathops.h" #undef FUNC diff --git a/libavcodec/flacdsp_template.c b/libavcodec/flacdsp_template.c index 892418cddc..0a6fe59e28 100644 --- a/libavcodec/flacdsp_template.c +++ b/libavcodec/flacdsp_template.c @@ -19,7 +19,7 @@ */ #include -#include "libavutil/avutil.h" +#include "libavutil/macros.h" #undef FUNC #undef FSUF diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index 3b33af61ef..3e1f133bf1 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -20,9 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "libavutil/attributes.h" #include "avcodec.h" #include "fmtconvert.h" -#include "libavutil/common.h" static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src, float mul, int len) diff --git a/libavcodec/golomb.c b/libavcodec/golomb.c index 937ac22ce1..f9ca8149eb 100644 --- a/libavcodec/golomb.c +++ b/libavcodec/golomb.c @@ -26,7 +26,7 @@ * @author Michael Niedermayer */ -#include "libavutil/common.h" +#include const uint8_t ff_golomb_vlc_len[512]={ 19,17,15,15,13,13,13,13,11,11,11,11,11,11,11,11,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, diff --git a/libavcodec/h264_levels.c b/libavcodec/h264_levels.c index 1b9f78da04..f7ed9a6e37 100644 --- a/libavcodec/h264_levels.c +++ b/libavcodec/h264_levels.c @@ -17,7 +17,7 @@ */ #include -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "h264_levels.h" // H.264 table A-1. diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 769946abfd..d64b064590 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -16,16 +16,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include -#include "libavutil/common.h" +#include "libavutil/log.h" #include "bsf.h" -#include "bsf_internal.h" #include "cbs.h" #include "cbs_bsf.h" #include "cbs_h264.h" +#include "codec_id.h" #include "h264.h" +#include "packet.h" #define NEW_GLOBAL_PIC_INIT_QP 26 diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 329c2ea4f2..034ddb8f1c 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -28,9 +28,9 @@ #include #include #include -#include "libavutil/common.h" #include "libavutil/error.h" #include "libavutil/log.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "atsc_a53.h" #include "get_bits.h" diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index be351ba2d6..99aa39c565 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -26,8 +26,11 @@ #include +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/macros.h" +#include "libavutil/mem.h" #include "libavutil/qsort.h" -#include "libavutil/common.h" #include "huffman.h" #include "vlc.h" diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c index bbcf598490..805e05808c 100644 --- a/libavcodec/jfdctfst.c +++ b/libavcodec/jfdctfst.c @@ -66,9 +66,8 @@ * Independent JPEG Group's fast AAN dct. */ -#include -#include -#include "libavutil/common.h" +#include +#include "libavutil/attributes.h" #include "dct.h" #define DCTSIZE 8 diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index ed24091fe8..f2da7307c4 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -25,7 +25,8 @@ * Discrete wavelet transform */ -#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "jpeg2000dwt.h" diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c index a1a0f571ad..36160cb663 100644 --- a/libavcodec/jrevdct.c +++ b/libavcodec/jrevdct.c @@ -62,7 +62,9 @@ * Independent JPEG Group's LLM idct. */ -#include "libavutil/common.h" +#include +#include + #include "libavutil/intreadwrite.h" #include "dct.h" diff --git a/libavcodec/lagarithrac.h b/libavcodec/lagarithrac.h index ee836d01db..a31b054dbb 100644 --- a/libavcodec/lagarithrac.h +++ b/libavcodec/lagarithrac.h @@ -31,7 +31,6 @@ #define AVCODEC_LAGARITHRAC_H #include -#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/libopus.c b/libavcodec/libopus.c index 16395c73df..3d3b740a83 100644 --- a/libavcodec/libopus.c +++ b/libavcodec/libopus.c @@ -21,7 +21,6 @@ #include -#include "libavutil/common.h" #include "libavutil/error.h" #include "libopus.h" diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 29055fd478..90f2efaafe 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #define FRAC_BITS 14 -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "mathops.h" #include "lsp.h" #include "libavcodec/mips/lsp_mips.h" diff --git a/libavcodec/lzwenc.c b/libavcodec/lzwenc.c index bb8eb2e1dd..ae1816a03e 100644 --- a/libavcodec/lzwenc.c +++ b/libavcodec/lzwenc.c @@ -27,7 +27,7 @@ #include #include "libavutil/avassert.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "lzw.h" #include "put_bits.h" diff --git a/libavcodec/mdct15.c b/libavcodec/mdct15.c index 6f35059bfe..3a735c77d4 100644 --- a/libavcodec/mdct15.c +++ b/libavcodec/mdct15.c @@ -27,11 +27,12 @@ #include #include #include +#include #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/common.h" +#include "libavutil/error.h" #include "mdct15.h" diff --git a/libavcodec/mips/mpegaudiodsp_mips_fixed.c b/libavcodec/mips/mpegaudiodsp_mips_fixed.c index 1c9c68d23c..ef9750a44e 100644 --- a/libavcodec/mips/mpegaudiodsp_mips_fixed.c +++ b/libavcodec/mips/mpegaudiodsp_mips_fixed.c @@ -54,6 +54,7 @@ #include +#include "config.h" #include "libavutil/mips/asmdefs.h" #include "libavcodec/mpegaudiodsp.h" diff --git a/libavcodec/mips/mpegaudiodsp_mips_float.c b/libavcodec/mips/mpegaudiodsp_mips_float.c index ae130c752e..53b77619c9 100644 --- a/libavcodec/mips/mpegaudiodsp_mips_float.c +++ b/libavcodec/mips/mpegaudiodsp_mips_float.c @@ -55,6 +55,7 @@ #include +#include "config.h" #include "libavutil/mips/asmdefs.h" #include "libavcodec/mpegaudiodsp.h" diff --git a/libavcodec/mjpegenc_huffman.c b/libavcodec/mjpegenc_huffman.c index 0e63f8066b..9bfcb7e785 100644 --- a/libavcodec/mjpegenc_huffman.c +++ b/libavcodec/mjpegenc_huffman.c @@ -21,10 +21,7 @@ #include #include -#include #include "libavutil/avassert.h" -#include "libavutil/common.h" -#include "libavutil/error.h" #include "libavutil/qsort.h" #include "mjpegenc_huffman.h" diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index 446a6e29d8..ef63befbf4 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -24,7 +24,7 @@ * MPEG Audio header decoder. */ -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "mpegaudio.h" #include "mpegaudiodata.h" diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h index 4577d515d9..7bc635191a 100644 --- a/libavcodec/mpegaudiodsp.h +++ b/libavcodec/mpegaudiodsp.h @@ -22,7 +22,7 @@ #include #include -#include "libavutil/common.h" +#include "libavutil/macros.h" typedef struct MPADSPContext { void (*apply_window_float)(float *synth_buf, float *window, diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index 87b4057d97..ec7957c126 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -30,7 +30,7 @@ #ifndef AVCODEC_MSMPEG4DATA_H #define AVCODEC_MSMPEG4DATA_H -#include "libavutil/common.h" +#include #include "rl.h" #include "vlc.h" diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c index 08df87ffbe..2c46afa839 100644 --- a/libavcodec/opusdsp.c +++ b/libavcodec/opusdsp.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "libavutil/attributes.h" #include "opusdsp.h" static void postfilter_c(float *data, int period, float *gains, int len) diff --git a/libavcodec/opusdsp.h b/libavcodec/opusdsp.h index ee3186dd44..3ea3d14bf0 100644 --- a/libavcodec/opusdsp.h +++ b/libavcodec/opusdsp.h @@ -19,8 +19,6 @@ #ifndef AVCODEC_OPUSDSP_H #define AVCODEC_OPUSDSP_H -#include "libavutil/common.h" - #define CELT_EMPH_COEFF 0.8500061035f typedef struct OpusDSP { diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index d2753163da..f450a4c5ee 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes.h" -#include "libavutil/common.h" #include "png.h" #include "pngdsp.h" diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h index 96b074bffb..e7b12c5fa6 100644 --- a/libavcodec/ra288.h +++ b/libavcodec/ra288.h @@ -23,7 +23,7 @@ #define AVCODEC_RA288_H #include -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "libavutil/mem_internal.h" static const float amptable[8]={ diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h index 4495f6df1a..89d178ac31 100644 --- a/libavcodec/rangecoder.h +++ b/libavcodec/rangecoder.h @@ -29,8 +29,8 @@ #include -#include "libavutil/common.h" #include "libavutil/avassert.h" +#include "libavutil/intmath.h" typedef struct RangeCoder { int low; diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 5efc1eb465..a371bb36c4 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -24,9 +24,9 @@ * Raw Video Codec */ +#include "libavutil/macros.h" #include "avcodec.h" #include "raw.h" -#include "libavutil/common.h" static const PixelFormatTag raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ diff --git a/libavcodec/rle.c b/libavcodec/rle.c index 1ef6077a6b..cebd238264 100644 --- a/libavcodec/rle.c +++ b/libavcodec/rle.c @@ -21,7 +21,7 @@ #include -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "rle.h" diff --git a/libavcodec/scpr3.h b/libavcodec/scpr3.h index 92ad968882..8988300ce0 100644 --- a/libavcodec/scpr3.h +++ b/libavcodec/scpr3.h @@ -23,12 +23,7 @@ #ifndef AVCODEC_SCPR3_H #define AVCODEC_SCPR3_H -#include -#include -#include - -#include "avcodec.h" -#include "internal.h" +#include typedef struct PixelModel3 { uint8_t type; diff --git a/libavcodec/tests/cabac.c b/libavcodec/tests/cabac.c index b84a96ce81..d9f98c68e0 100644 --- a/libavcodec/tests/cabac.c +++ b/libavcodec/tests/cabac.c @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/cabac_functions.h" #include "libavcodec/cabac.c" #define SIZE 10240 #include "libavutil/lfg.h" -#include "libavcodec/avcodec.h" #include "libavcodec/put_bits.h" typedef struct CABACTestContext { diff --git a/libavcodec/tests/jpeg2000dwt.c b/libavcodec/tests/jpeg2000dwt.c index 80b33bee79..0e5a6ed947 100644 --- a/libavcodec/tests/jpeg2000dwt.c +++ b/libavcodec/tests/jpeg2000dwt.c @@ -20,6 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + +#include "libavutil/common.h" + #include "libavcodec/jpeg2000dwt.c" #include "libavutil/lfg.h" diff --git a/libavcodec/tests/rangecoder.c b/libavcodec/tests/rangecoder.c index ca96e13c99..fd858535a5 100644 --- a/libavcodec/tests/rangecoder.c +++ b/libavcodec/tests/rangecoder.c @@ -19,6 +19,7 @@ #include #include +#include "libavutil/error.h" #include "libavutil/lfg.h" #include "libavutil/log.h" diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/trace_headers_bsf.c index a9b0247412..96a52fac53 100644 --- a/libavcodec/trace_headers_bsf.c +++ b/libavcodec/trace_headers_bsf.c @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include "libavutil/avstring.h" -#include "libavutil/common.h" +#include "libavutil/avutil.h" #include "libavutil/log.h" #include "bsf.h" diff --git a/libavcodec/videodsp.c b/libavcodec/videodsp.c index 212147984f..2198d46c15 100644 --- a/libavcodec/videodsp.c +++ b/libavcodec/videodsp.c @@ -18,9 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "videodsp.h" #define BIT_DEPTH 8 diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h index 3be268c317..aaca1fd088 100644 --- a/libavcodec/vp56data.h +++ b/libavcodec/vp56data.h @@ -26,7 +26,7 @@ #ifndef AVCODEC_VP56DATA_H #define AVCODEC_VP56DATA_H -#include "libavutil/common.h" +#include #include "vp56.h" extern const uint8_t ff_vp56_b2p[]; diff --git a/libavcodec/vp56rac.c b/libavcodec/vp56rac.c index 64fb6a99b4..19e7dcf2bb 100644 --- a/libavcodec/vp56rac.c +++ b/libavcodec/vp56rac.c @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" +#include +#include "libavutil/error.h" +#include "bytestream.h" #include "vp56.h" const uint8_t ff_vp56_norm_shift[256]= { diff --git a/libavcodec/vp9dsp.c b/libavcodec/vp9dsp.c index 82bfe394d1..3441419e2d 100644 --- a/libavcodec/vp9dsp.c +++ b/libavcodec/vp9dsp.c @@ -21,8 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + +#include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/common.h" #include "libavutil/mem_internal.h" #include "vp9dsp.h" diff --git a/libavcodec/wavpack.h b/libavcodec/wavpack.h index 7e7dfce2b7..9f62f8406d 100644 --- a/libavcodec/wavpack.h +++ b/libavcodec/wavpack.h @@ -22,7 +22,10 @@ #ifndef AVCODEC_WAVPACK_H #define AVCODEC_WAVPACK_H -#include "libavutil/common.h" +#include +#include +#include "libavutil/attributes.h" +#include "libavutil/intmath.h" #define MAX_TERMS 16 #define MAX_TERM 8 diff --git a/libavcodec/wavpackenc.h b/libavcodec/wavpackenc.h index 11914337cf..b6d12e8a5c 100644 --- a/libavcodec/wavpackenc.h +++ b/libavcodec/wavpackenc.h @@ -21,6 +21,8 @@ #ifndef AVCODEC_WAVPACKENC_H #define AVCODEC_WAVPACKENC_H +#include +#include "libavutil/macros.h" #include "wavpack.h" typedef struct WavPackDecorrSpec { diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c index 033ff1ccc5..835fcc2b28 100644 --- a/libavcodec/x86/fdct.c +++ b/libavcodec/x86/fdct.c @@ -30,8 +30,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "fdct.h" diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index 50692f29ce..dcea94a1f5 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/internal.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" diff --git a/libavcodec/x86/pngdsp_init.c b/libavcodec/x86/pngdsp_init.c index 7dca62c675..edbe866c22 100644 --- a/libavcodec/x86/pngdsp_init.c +++ b/libavcodec/x86/pngdsp_init.c @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include "config.h" #include "libavutil/attributes.h" -#include "libavutil/common.h" #include "libavutil/x86/cpu.h" #include "libavcodec/pngdsp.h" diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c index 3073315e63..218b0813e9 100644 --- a/libavcodec/xiph.c +++ b/libavcodec/xiph.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" #include "xiph.h" diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h index 1741a51b65..4ab2469528 100644 --- a/libavcodec/xiph.h +++ b/libavcodec/xiph.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_XIPH_H #define AVCODEC_XIPH_H -#include "libavutil/common.h" +#include /** * Split a single extradata buffer into the three headers that most diff --git a/libavdevice/timefilter.c b/libavdevice/timefilter.c index ad6485d5e7..a97afc5fdc 100644 --- a/libavdevice/timefilter.c +++ b/libavdevice/timefilter.c @@ -22,7 +22,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" +#include +#include + +#include "libavutil/macros.h" +#include "libavutil/mathematics.h" #include "libavutil/mem.h" #include "timefilter.h" diff --git a/libavfilter/af_afir.h b/libavfilter/af_afir.h index 8f40c1b2f4..cf00dbfc66 100644 --- a/libavfilter/af_afir.h +++ b/libavfilter/af_afir.h @@ -21,15 +21,14 @@ #ifndef AVFILTER_AFIR_H #define AVFILTER_AFIR_H +#include +#include + #include "libavutil/tx.h" -#include "libavutil/common.h" #include "libavutil/float_dsp.h" -#include "libavutil/opt.h" - -#include "audio.h" -#include "avfilter.h" -#include "formats.h" -#include "internal.h" +#include "libavutil/frame.h" +#include "libavutil/log.h" +#include "libavutil/rational.h" typedef struct AudioFIRSegment { int nb_partitions; diff --git a/libavfilter/af_volume.h b/libavfilter/af_volume.h index af46e34ff6..c97902969e 100644 --- a/libavfilter/af_volume.h +++ b/libavfilter/af_volume.h @@ -24,10 +24,10 @@ #ifndef AVFILTER_VOLUME_H #define AVFILTER_VOLUME_H -#include "libavutil/common.h" +#include #include "libavutil/eval.h" #include "libavutil/float_dsp.h" -#include "libavutil/opt.h" +#include "libavutil/log.h" #include "libavutil/samplefmt.h" enum PrecisionType { diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index b8b432e98b..74bfbe2103 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -25,11 +25,9 @@ #include #include "libavutil/avassert.h" -#include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/imgutils.h" -#include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/colorspace.h b/libavfilter/colorspace.h index 459a5df60d..a4c5078d5f 100644 --- a/libavfilter/colorspace.h +++ b/libavfilter/colorspace.h @@ -20,8 +20,8 @@ #ifndef AVFILTER_COLORSPACE_H #define AVFILTER_COLORSPACE_H -#include "libavutil/common.h" #include "libavutil/frame.h" +#include "libavutil/pixfmt.h" #define REFERENCE_WHITE 100.0f diff --git a/libavfilter/ebur128.c b/libavfilter/ebur128.c index 1a85a90360..062099e206 100644 --- a/libavfilter/ebur128.c +++ b/libavfilter/ebur128.c @@ -47,7 +47,8 @@ #include #include /* You may have to define _USE_MATH_DEFINES if you use MSVC */ -#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" diff --git a/libavfilter/motion_estimation.c b/libavfilter/motion_estimation.c index 0f9ba21784..2bf5ce6155 100644 --- a/libavfilter/motion_estimation.c +++ b/libavfilter/motion_estimation.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "motion_estimation.h" static const int8_t sqr1[8][2] = {{ 0,-1}, { 0, 1}, {-1, 0}, { 1, 0}, {-1,-1}, {-1, 1}, { 1,-1}, { 1, 1}}; diff --git a/libavfilter/motion_estimation.h b/libavfilter/motion_estimation.h index 6ae29dd9e3..be627ec3b0 100644 --- a/libavfilter/motion_estimation.h +++ b/libavfilter/motion_estimation.h @@ -21,7 +21,7 @@ #ifndef AVFILTER_MOTION_ESTIMATION_H #define AVFILTER_MOTION_ESTIMATION_H -#include "libavutil/avutil.h" +#include #define AV_ME_METHOD_ESA 1 #define AV_ME_METHOD_TSS 2 diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c index 34fc699505..1a063d3cc0 100644 --- a/libavfilter/pthread.c +++ b/libavfilter/pthread.c @@ -21,11 +21,11 @@ * Libavfilter multithreading support */ -#include "config.h" +#include -#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" -#include "libavutil/thread.h" #include "libavutil/slicethread.h" #include "avfilter.h" diff --git a/libavformat/argo_asf.h b/libavformat/argo_asf.h index 1fab31a90b..948459d0b7 100644 --- a/libavformat/argo_asf.h +++ b/libavformat/argo_asf.h @@ -24,7 +24,7 @@ #define AVFORMAT_ARGO_ASF_H #include -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "avformat.h" diff --git a/libavformat/asfcrypt.c b/libavformat/asfcrypt.c index 221a8a89bc..c77e37503e 100644 --- a/libavformat/asfcrypt.c +++ b/libavformat/asfcrypt.c @@ -20,10 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "libavutil/bswap.h" -#include "libavutil/common.h" #include "libavutil/des.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" #include "libavutil/rc4.h" #include "asfcrypt.h" diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index c36893c999..782a58adb2 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -19,8 +19,7 @@ */ #include "avlanguage.h" -#include "libavutil/avstring.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include #include #include diff --git a/libavformat/hlsplaylist.h b/libavformat/hlsplaylist.h index 29487da3ed..1928fe787d 100644 --- a/libavformat/hlsplaylist.h +++ b/libavformat/hlsplaylist.h @@ -25,7 +25,6 @@ #include -#include "libavutil/common.h" #include "avformat.h" #include "avio.h" diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 16491aae22..45077ed33f 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -23,8 +23,8 @@ #define AVFORMAT_MATROSKA_H #include "libavcodec/codec_id.h" +#include "avformat.h" #include "metadata.h" -#include "internal.h" /* EBML version supported */ #define EBML_VERSION 1 diff --git a/libavformat/network.c b/libavformat/network.c index 96fe636745..1ced314c92 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -22,7 +22,6 @@ #include "network.h" #include "tls.h" #include "url.h" -#include "libavutil/avutil.h" #include "libavutil/avassert.h" #include "libavutil/mem.h" #include "libavutil/time.h" diff --git a/libavformat/riff.c b/libavformat/riff.c index 27a9706510..0c19d3f784 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "config.h" -#include "libavutil/common.h" +#include "libavutil/macros.h" #include "avformat.h" #include "internal.h" #include "metadata.h" diff --git a/libavformat/tee_common.c b/libavformat/tee_common.c index a9608871b5..e516b0a603 100644 --- a/libavformat/tee_common.c +++ b/libavformat/tee_common.c @@ -19,8 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avutil.h" -#include "libavutil/avstring.h" +#include + +#include "libavutil/log.h" #include "libavutil/opt.h" #include "tee_common.h" diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index cf69bd35b1..a942c484e9 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -38,6 +38,8 @@ #include "libavutil/opt.h" #include "libavutil/time_internal.h" +#include "libavcodec/codec_desc.h" + typedef struct AdaptationSet { char id[10]; int *streams; diff --git a/libavformat/wv.c b/libavformat/wv.c index 0f4f80761a..b260bb9fc3 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -21,8 +21,9 @@ #include #include -#include "libavutil/common.h" +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" +#include "libavutil/macros.h" #include "wv.h" diff --git a/libavutil/adler32.c b/libavutil/adler32.c index f7d3062265..7124f18802 100644 --- a/libavutil/adler32.c +++ b/libavutil/adler32.c @@ -32,8 +32,8 @@ #include "config.h" #include "adler32.h" -#include "common.h" #include "intreadwrite.h" +#include "macros.h" #define BASE 65521L /* largest prime smaller than 65536 */ diff --git a/libavutil/aes.c b/libavutil/aes.c index 397ea77389..029d738f87 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -20,11 +20,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "common.h" +#include + +#include "config.h" #include "aes.h" #include "aes_internal.h" +#include "error.h" #include "intreadwrite.h" -#include "timer.h" +#include "macros.h" +#include "mem.h" const int av_aes_size= sizeof(AVAES); diff --git a/libavutil/aes_ctr.c b/libavutil/aes_ctr.c index 517d09cf96..c2d6d570e7 100644 --- a/libavutil/aes_ctr.c +++ b/libavutil/aes_ctr.c @@ -19,10 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "common.h" +#include + #include "aes_ctr.h" #include "aes.h" #include "aes_internal.h" +#include "macros.h" +#include "mem.h" #include "random_seed.h" #define AES_BLOCK_SIZE (16) diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c index a034407d14..7061e6d965 100644 --- a/libavutil/avsscanf.c +++ b/libavutil/avsscanf.c @@ -21,16 +21,18 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include +#include +#include #include +#include #include #include #include #include -#include "config.h" -#include "common.h" #include "avstring.h" -#include "bprint.h" +#include "libm.h" typedef struct FFFILE { size_t buf_size; diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 49e8df55aa..5ddbe9219e 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -19,17 +19,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include #include #include "config.h" -#include "common.h" #include "mem.h" #include "avassert.h" #include "avstring.h" #include "bprint.h" +#include "error.h" +#include "macros.h" +#include "version.h" int av_strstart(const char *str, const char *pfx, const char **ptr) { diff --git a/libavutil/base64.c b/libavutil/base64.c index a1316b9438..3e66f4fcbe 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -24,10 +24,12 @@ * @author Ryan Martell (with lots of Michael) */ -#include "common.h" +#include +#include + #include "base64.h" +#include "error.h" #include "intreadwrite.h" -#include "timer.h" /* ---------------- private code */ static const uint8_t map2[256] = diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c index abc0e03d4d..6df60150ea 100644 --- a/libavutil/blowfish.c +++ b/libavutil/blowfish.c @@ -21,8 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avutil.h" -#include "common.h" +#include + +#include "attributes.h" #include "intreadwrite.h" #include "mem.h" #include "blowfish.h" diff --git a/libavutil/bprint.c b/libavutil/bprint.c index ea51d9b09c..5b540ebc9e 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -18,15 +18,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include #include #include "avstring.h" #include "bprint.h" -#include "common.h" #include "compat/va_copy.h" #include "error.h" +#include "macros.h" #include "mem.h" #define av_bprint_room(buf) ((buf)->size - FFMIN((buf)->len, (buf)->size)) diff --git a/libavutil/buffer_internal.h b/libavutil/buffer_internal.h index bdff1b5b32..adb916aaa2 100644 --- a/libavutil/buffer_internal.h +++ b/libavutil/buffer_internal.h @@ -22,7 +22,6 @@ #include #include -#include "internal.h" #include "buffer.h" #include "thread.h" diff --git a/libavutil/camellia.c b/libavutil/camellia.c index f33ee9babc..3fc3b08291 100644 --- a/libavutil/camellia.c +++ b/libavutil/camellia.c @@ -18,9 +18,13 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include + #include "camellia.h" -#include "common.h" +#include "error.h" #include "intreadwrite.h" +#include "mem.h" #include "attributes.h" #define LR32(x,c) ((x) << (c) | (x) >> (32 - (c))) diff --git a/libavutil/cast5.c b/libavutil/cast5.c index 445eb55c12..0bf8ae9929 100644 --- a/libavutil/cast5.c +++ b/libavutil/cast5.c @@ -18,9 +18,13 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include + #include "cast5.h" -#include "common.h" +#include "error.h" #include "intreadwrite.h" +#include "mem.h" #include "attributes.h" #define IA(x) ((x) >> 24) diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index ac773a9e63..b9507b1bff 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -24,12 +24,14 @@ */ #include +#include +#include -#include "avstring.h" -#include "avutil.h" #include "channel_layout.h" #include "bprint.h" #include "common.h" +#include "error.h" +#include "macros.h" struct channel_name { const char *name; diff --git a/libavutil/color_utils.c b/libavutil/color_utils.c index eb8bc7b5fc..5e221fb798 100644 --- a/libavutil/color_utils.c +++ b/libavutil/color_utils.c @@ -21,7 +21,6 @@ #include #include -#include "common.h" #include "libavutil/color_utils.h" #include "libavutil/pixfmt.h" diff --git a/libavutil/crc.c b/libavutil/crc.c index c45ea63a62..703b56f4e0 100644 --- a/libavutil/crc.c +++ b/libavutil/crc.c @@ -23,8 +23,8 @@ #include "thread.h" #include "avassert.h" #include "bswap.h" -#include "common.h" #include "crc.h" +#include "error.h" #if CONFIG_HARDCODED_TABLES static const AVCRC av_crc_table[AV_CRC_MAX][257] = { diff --git a/libavutil/des.c b/libavutil/des.c index 6957666184..e0e9a86660 100644 --- a/libavutil/des.c +++ b/libavutil/des.c @@ -19,10 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + #include -#include "avutil.h" -#include "common.h" +#include "attributes.h" +#include "error.h" #include "intreadwrite.h" #include "mem.h" #include "des.h" diff --git a/libavutil/error.c b/libavutil/error.c index b96304837b..938a8bc000 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -18,9 +18,12 @@ #undef _GNU_SOURCE #define _XOPEN_SOURCE 600 /* XSI-compliant version of strerror_r */ -#include "avutil.h" +#include +#include +#include "config.h" #include "avstring.h" -#include "common.h" +#include "error.h" +#include "macros.h" struct error_entry { int num; diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c index f1b195f184..098ef9c061 100644 --- a/libavutil/fixed_dsp.c +++ b/libavutil/fixed_dsp.c @@ -45,6 +45,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "common.h" #include "fixed_dsp.h" static void vector_fmul_add_c(int *dst, const int *src0, const int *src1, const int *src2, int len){ diff --git a/libavutil/fixed_dsp.h b/libavutil/fixed_dsp.h index f554cb5038..fec806ff2d 100644 --- a/libavutil/fixed_dsp.h +++ b/libavutil/fixed_dsp.h @@ -49,8 +49,8 @@ #define AVUTIL_FIXED_DSP_H #include +#include "config.h" #include "attributes.h" -#include "common.h" #include "libavcodec/mathops.h" typedef struct AVFixedDSPContext { diff --git a/libavutil/lls.c b/libavutil/lls.c index 3a136baa2d..ea2d80e662 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -28,8 +28,8 @@ #include #include +#include "config.h" #include "attributes.h" -#include "internal.h" #include "lls.h" static void update_lls(LLSModel *m, const double *var) diff --git a/libavutil/log.c b/libavutil/log.c index 66defa9c42..5948e50467 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -32,9 +32,11 @@ #if HAVE_IO_H #include #endif +#include #include +#include #include -#include "avutil.h" +#include #include "bprint.h" #include "common.h" #include "internal.h" diff --git a/libavutil/lzo.c b/libavutil/lzo.c index 1ae076e335..bcbe2c861d 100644 --- a/libavutil/lzo.c +++ b/libavutil/lzo.c @@ -19,13 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include #include -#include "avutil.h" #include "avassert.h" -#include "common.h" #include "intreadwrite.h" #include "lzo.h" +#include "macros.h" +#include "mem.h" /// Define if we may write up to 12 bytes beyond the output buffer. #define OUTBUF_PADDED 1 diff --git a/libavutil/mem.c b/libavutil/mem.c index 194d880587..a0c9a42849 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -37,10 +37,13 @@ #include #endif -#include "avutil.h" -#include "common.h" +#include "attributes.h" +#include "avassert.h" #include "dynarray.h" +#include "error.h" +#include "internal.h" #include "intreadwrite.h" +#include "macros.h" #include "mem.h" #ifdef MALLOC_PREFIX @@ -59,8 +62,6 @@ void free(void *ptr); #endif /* MALLOC_PREFIX */ -#include "mem_internal.h" - #define ALIGN (HAVE_AVX512 ? 64 : (HAVE_AVX ? 32 : 16)) /* NOTE: if you want to override these functions with your own diff --git a/libavutil/pixelutils.c b/libavutil/pixelutils.c index ebee3d6f90..820889a143 100644 --- a/libavutil/pixelutils.c +++ b/libavutil/pixelutils.c @@ -16,12 +16,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "config.h" -#include "common.h" #include "pixelutils.h" -#include "internal.h" #if CONFIG_PIXELUTILS +#include +#include + +#include "attributes.h" +#include "macros.h" #include "x86/pixelutils.h" @@ -60,7 +65,8 @@ static const av_pixelutils_sad_fn sad_c[] = { block_sad_16x16_c, block_sad_32x32_c, }; - +#else +#include "log.h" #endif /* CONFIG_PIXELUTILS */ av_pixelutils_sad_fn av_pixelutils_get_sad_fn(int w_bits, int h_bits, int aligned, void *log_ctx) diff --git a/libavutil/qsort.h b/libavutil/qsort.h index 39b7a08852..6014f88be3 100644 --- a/libavutil/qsort.h +++ b/libavutil/qsort.h @@ -21,7 +21,7 @@ #ifndef AVUTIL_QSORT_H #define AVUTIL_QSORT_H -#include "common.h" +#include "macros.h" /** diff --git a/libavutil/rc4.c b/libavutil/rc4.c index ffcb112142..74c1f4892e 100644 --- a/libavutil/rc4.c +++ b/libavutil/rc4.c @@ -20,8 +20,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avutil.h" -#include "common.h" + +#include "error.h" +#include "macros.h" #include "mem.h" #include "rc4.h" diff --git a/libavutil/ripemd.c b/libavutil/ripemd.c index b8e9761a24..e170c69f42 100644 --- a/libavutil/ripemd.c +++ b/libavutil/ripemd.c @@ -22,10 +22,12 @@ #include #include +#include "config.h" #include "attributes.h" -#include "avutil.h" #include "bswap.h" +#include "error.h" #include "intreadwrite.h" +#include "macros.h" #include "ripemd.h" #include "mem.h" diff --git a/libavutil/sha.c b/libavutil/sha.c index ab42869c7b..0df044032f 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -23,9 +23,10 @@ #include +#include "config.h" #include "attributes.h" -#include "avutil.h" #include "bswap.h" +#include "error.h" #include "sha.h" #include "intreadwrite.h" #include "mem.h" diff --git a/libavutil/sha512.c b/libavutil/sha512.c index 97aaaa865c..0574a46f94 100644 --- a/libavutil/sha512.c +++ b/libavutil/sha512.c @@ -23,9 +23,10 @@ #include +#include "config.h" #include "attributes.h" -#include "avutil.h" #include "bswap.h" +#include "error.h" #include "sha512.h" #include "intreadwrite.h" #include "mem.h" diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 279fcc1ff3..9c29ab01b5 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -21,7 +21,8 @@ #include #include "avstring.h" -#include "common.h" +#include "frame.h" +#include "macros.h" #include "mem.h" #include "stereo3d.h" diff --git a/libavutil/tea.c b/libavutil/tea.c index b138f8bea1..93a3795368 100644 --- a/libavutil/tea.c +++ b/libavutil/tea.c @@ -22,9 +22,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avutil.h" -#include "common.h" +#include #include "intreadwrite.h" +#include "mem.h" #include "tea.h" typedef struct AVTEA { diff --git a/libavutil/tests/color_utils.c b/libavutil/tests/color_utils.c index ea0127158b..4bdc550330 100644 --- a/libavutil/tests/color_utils.c +++ b/libavutil/tests/color_utils.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "libavutil/color_utils.c" +#include "libavutil/macros.h" int main(int argc, char *argv[]) { diff --git a/libavutil/tests/pixelutils.c b/libavutil/tests/pixelutils.c index 2f807584b3..927c8d9217 100644 --- a/libavutil/tests/pixelutils.c +++ b/libavutil/tests/pixelutils.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + +#include "libavutil/internal.h" +#include "libavutil/mem.h" #include "libavutil/pixelutils.c" #define W1 320 diff --git a/libavutil/twofish.c b/libavutil/twofish.c index 649b4bc41b..9f9687eccb 100644 --- a/libavutil/twofish.c +++ b/libavutil/twofish.c @@ -18,9 +18,13 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include + #include "twofish.h" -#include "common.h" +#include "error.h" #include "intreadwrite.h" +#include "mem.h" #include "attributes.h" #define LR(x, n) ((x) << (n) | (x) >> (32 - (n))) diff --git a/libavutil/video_enc_params.c b/libavutil/video_enc_params.c index 7d903af385..54bfed0ed9 100644 --- a/libavutil/video_enc_params.c +++ b/libavutil/video_enc_params.c @@ -16,12 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include #include "buffer.h" -#include "common.h" #include "frame.h" #include "mem.h" #include "video_enc_params.h" diff --git a/libavutil/x86/imgutils_init.c b/libavutil/x86/imgutils_init.c index 4ea398205e..91a16cf594 100644 --- a/libavutil/x86/imgutils_init.c +++ b/libavutil/x86/imgutils_init.c @@ -21,9 +21,8 @@ #include "libavutil/cpu.h" #include "libavutil/error.h" -#include "libavutil/imgutils.h" #include "libavutil/imgutils_internal.h" -#include "libavutil/internal.h" +#include "libavutil/macros.h" #include "cpu.h" diff --git a/libavutil/xtea.c b/libavutil/xtea.c index f7892af9fb..6f376c365c 100644 --- a/libavutil/xtea.c +++ b/libavutil/xtea.c @@ -28,8 +28,8 @@ * @ingroup lavu_xtea */ -#include "avutil.h" -#include "common.h" +#include +#include "config.h" #include "intreadwrite.h" #include "mem.h" #include "xtea.h" diff --git a/libswscale/input.c b/libswscale/input.c index 6acc39f89f..fe0c27d743 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -21,17 +21,11 @@ #include #include #include -#include -#include "libavutil/avutil.h" #include "libavutil/bswap.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mathematics.h" -#include "libavutil/pixdesc.h" #include "libavutil/avassert.h" #include "config.h" -#include "rgb2rgb.h" -#include "swscale.h" #include "swscale_internal.h" #define input_pixel(pos) (isBE(origin) ? AV_RB16(pos) : AV_RL16(pos)) diff --git a/libswscale/options.c b/libswscale/options.c index f6ea9e1f9d..4d41b835b1 100644 --- a/libswscale/options.c +++ b/libswscale/options.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avutil.h" #include "libavutil/opt.h" -#include "libavutil/pixfmt.h" #include "swscale.h" #include "swscale_internal.h" diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index 48bba1586a..7272e98c57 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -26,10 +26,7 @@ #ifndef SWSCALE_RGB2RGB_H #define SWSCALE_RGB2RGB_H -#include - -#include "libavutil/avutil.h" -#include "swscale.h" +#include /* A full collection of RGB to RGB(BGR) converters */ extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size); diff --git a/libswscale/swscale.c b/libswscale/swscale.c index feef3482d2..3ed547d526 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -18,22 +18,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include #include #include #include "libavutil/avassert.h" -#include "libavutil/avutil.h" #include "libavutil/bswap.h" +#include "libavutil/common.h" #include "libavutil/cpu.h" -#include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mathematics.h" #include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" #include "config.h" -#include "rgb2rgb.h" #include "swscale_internal.h" #include "swscale.h" diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 2be23458a1..78979f1c7b 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -26,7 +26,6 @@ #include "config.h" #include "libavutil/avassert.h" -#include "libavutil/avutil.h" #include "libavutil/common.h" #include "libavutil/frame.h" #include "libavutil/intreadwrite.h"