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" /**