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]);