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 * @{