From patchwork Mon Oct 3 22:45: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: 38546 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1575679pzh; Mon, 3 Oct 2022 15:46:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5sQmdyWSY7PBIV7p4YGSiQE25PH+aJQRqJQml032EHYREh9sGVYHqMsm17fPHJ/synyRyj X-Received: by 2002:aa7:d556:0:b0:451:f7e6:5121 with SMTP id u22-20020aa7d556000000b00451f7e65121mr20864059edr.188.1664837206084; Mon, 03 Oct 2022 15:46:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id xi10-20020a170906daca00b0078cee73346fsi1734918ejb.664.2022.10.03.15.46.45; Mon, 03 Oct 2022 15:46:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=cIVMHWCc; 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 7130D68BB4E; Tue, 4 Oct 2022 01:46:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2011.outbound.protection.outlook.com [40.92.58.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7CDC68BBFC for ; Tue, 4 Oct 2022 01:46:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jrE8QlR++Kh2ttxMp54P5/hPajreGXOcOi/tfZ9g4tnQypVqdQniPusvItfLgDpsWzDIaRvAY8dBxk+5+e7rnhD5y4aWZO+ijnBalCF3FeJtT2riCcxne7otELNfWjgDN4/p8hM1anDP6T6FkT8yygX5IXIMHrR27Eb3kejlJGvIFAvmaBzoEdWKKHGp7dXfjMBmsmUu7MBrcE22YbH7kYSQ2HrHr66FFvisYnUE/sbqptL1bhvXyeXQ1h7X4nc+HQsgp30VztSvaAaBgrQxH8QQkGjOX1zyr8Z2LNh0xI84KxXQ8tQn6PPIA91Dz8w8/MC78eesURB0F0Ts6Gx1wg== 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=FJ/XHEEUm0SSA6ByFirMMoLPPTXfpni0DLSGnTAqRGY=; b=WDQ/Zbl7EzVlPiB59BOngDy+zXenOmxZ+V8R4Sbbj/D5xkqOVvo3O0WqLXOPWJ/+SnEvDpXWOVnKBLlYSCKjUzwqS5TThmkbesAIepxgWgMqschA4xcY106uN94EC363ONmSM8MHHby2Vi8PH1Ne1iT7s7a+XCMHqR+t7cWUKinsQGwgdoaubR36tKBJi3IhUAtud8nB4t3WBKdqwMfmvpWORoUCnQnDhJTDwvY+YjN8eRbMekDfMLCnTWsayZ4QfQWkx4Vr7OIkIfAe89E1Sb5XtKGqH8iFcMLCGQ4wIoOQazgH6CwF82U59a4iI7O9pK/3mwDM8BsPQ/4z0a8jew== 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=FJ/XHEEUm0SSA6ByFirMMoLPPTXfpni0DLSGnTAqRGY=; b=cIVMHWCcL0xFPxgQs5rUgUUF2I7ZHp/QeEWvqZSJNEv25k06zJHIAvqEEFnF1ixjx6wxJNVgVUv8iE1KrvvoCmQN95MNDcMfcievY4ReUgnhTxPEitSDUNwqERli/YyzxGqsqnPPJypTxh1nS/afVzXqjjqPgRui53OAsysLz6A8bt9v4Buh9Nxz6Hs33YAHcrPCnoos9KEpkbGj8xWk/gJnEU0QG5gZSvvhnlZOX29dFpQqpb4f+wJmTC9OyIWbRi0bA19RB7UdNJfHrks8aYSlqZvXkZDUAD5opMZar31P47Zp3GrISmxG3zAmSUPdGdFPbaAyj0Jhk8wjErouAA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0470.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:283::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Mon, 3 Oct 2022 22:46:35 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Mon, 3 Oct 2022 22:46:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2022 00:45:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [h0SfQ3uaWkLSZBXhYbQU9KE9y2XyqBkwutYF4POvnAE=] X-ClientProxiedBy: ZR0P278CA0056.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221003224505.1846824-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0470:EE_ X-MS-Office365-Filtering-Correlation-Id: 929b6527-e41d-4f41-d8a8-08daa5911fed X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyycDCnlURLUH4o9GEGbttoqQzgET2zkErdVu/O0w0U9Uj6kv7cUouIMyHV7ociw+Ho2UfpKkM9UlhgjIXyp36QkOOYAFFmnnW7OF5Xp+nNRw2+Ks5N+c7J+86vHIv9tTOCs5JZ7X33/pQ+KU7h3vZOGEVHO93o/EsLR+qi8iF1F5nMsDu3KXmghMsbxuVOK+z8Soi7NCAWR27BsLAlv+IYmljjzwL2N13iT5AlZ1NuX740iXEDXxiTZECNls1LN1BRthsa107JYgASooL3kwLfGVf40LVh1e9iRNzninB568nIGTwIJxYpaVrvIpjQOqfwCogJ0MyQqW7doND03OzWP9ClQFMRvCt8PHuKyOkEUPVVwtd6YTxB73NH2CRGN/wHa8MxQwM+iOpZgT3KphHUTI3/QtaKrFs7GvINM7nxQvxuake7LCsUdun6TLLkAFNcZItOcyfavDhSB9SFRDb1bUCSBrYn2TtBBnQk1hrZT67mqOc7VdePRr6pi5Ipar4ckyMaMRxXiTt9NUqMDW4gKyopKLce8ED9MeHBqy1bONHD/p4mOnSguxd2q4dffcG+7nT+MCX5krHO+oQmuyINlsjBB2FsgjARPG4iKBl9dTGReatIUO+JR2yNoe1BzV1B8qB6uCS2l5z5FvQ7l0SK0g7jye1MkyfeQU38k3AgHCNJhL/4bhVC/wanRYOhZCk3bTAUvJgQPvjXxzzv6P8LZayn/68AAr0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2SAHJG+5/FiDBIhNL3FjFkkIVxCLZ+w+B+zboxgm+UB2fKaU4awSVKh9rQGdWrHm8SSKWjmfzFB3WzgI0BhOGfWJJwbv1d+KKeCvcl6k/vRPckd2So2tdnw0uuIyii1zBsf4fyocvhs13VMSZjlL0j43bsiT8zBhxLhZ2mVv7+DNmquvRdA8qUQ0+5ULhzjXBl2McE+HYrQBsvnJKDZ3r/4Eh638RRXH/g+tOxt7j+t+5gMoOohCARq2xrT9gNZHszSKXswspeM4+nQi05/pcoEqEpvlj9YvPKELeAqW+lM5G/9uPamzZF9jxUrBiYQV0JKurbhfJJUTNLT9On3HIGoWys4frQ5MSAUgf/8TYfycn74ofNnusvVAhNXe/cUzRqYnH18bcVXvlBk027Dsjxbrfnn5nfIKvZbPyO4x7gSEV5w/D35pNnBpTv9qoT9EAXVehy8n3WhOGcEmNZWPjlp2WqSBsv++5y3C5u5RaERVBwLCm29EtCVTS5gnURUn+71jUDJmjSQAZxTUy//mMjKdZc35hIbSr3+Vlu/2kHljWEZ8CBJeu67RWNvlnMtMWldwH3H1SmL1MMajAIWN4XCelJHw8GBZLufoYQKCREO7FcXsEJbwUfGd1oGs6Zl2KzZ+BmQvYNuq/71CTaCjAW/n0Zxd61LNLT5ej3qXhisArYv8ON7brxwLW1V7tovs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +rjntScc7nm7Cxs9ViuTPNbN8otTfgb1y/VEJey8d+QzpmnVJGEmg1sdkHNwo7MfU2M2zF1U2DIFxnOrvsvwh95oKsH8F5gF2Q1j0NdAERUQvweMzmXyYgSRAxB+WRCfo5p6BOMKkkegXMkyoQsc2MP39LgJsUg/qDTqGd1iwwKNo7/c2eO2vtcm3mT4Jnk/V+/ih2Yn36XEWAC0F9DAYN5YmCHL25wNMcmYnD0aiS76UQZVgZz0FSUvApcl1c10U+yO36Fyl0p0xTISVQWtuRsmQbmt3aUpZsC5/DuSXbCKmg/VBbSSvRdth4dEEhdPRfW1GVjQqKek85PwKx81H+LSB6hgJeMUxVXk90pu+EjcW5X0KE3I1y3AhSiIDtGOk6ki/slbf/X6y7K3pgls22WHl7zpB0rLdxfgiCxmyX0uRpNs4geHyLmyPaQV02J9rq0GkmAsDPS+hR57fsk/9XvVVLOqvK/1Bx7f8W97dimNYr+kRMusQaz2tf1T0QfmpTIqVdd+HRcSlX5aLkY8D8S8C8AKTvLmedU8LkXZl5AVi2nSisdWA0OLkbfpVGkUFexvIY4SxEWL8lCn4a23UvwBT97Fdt/LZpeqUyBRGI4DpisXwItuAKPwdWcGH/e2qzDmamRIaMFlRTKPXtF75EBmVpFj/feJydHellvv0nlSVjbtDLHW2vxgfK2acL1OMPulens96g2IEXjko4RhLC0De1a/PWH3NsGmulJxw68uxqVOMELmFAEIVeuO96UvWWq4z+e9fHdtJARjs7k1GpF8Tds3Wzk1vm+0KAdPihwDV4N554HJzdBav0iW48upgD/XLUYpdlCKFLM/BT2ll5Bdiullo5JbaWi6fBZXQG69Va/D0JBTOt/PO4BCQqCN6YjKoSRt9txh/GmjGn3o6Tvp0N8tZOnkH3BG2pLeTC25dq9MvOY1XVENqeReZpXyKNAxBAJK35YjUYwBqEE1zApNCOtddWzZSUegLd5H07UCcuon1BBSiKXcMtiiE6sDzyvfxIgDt+t62PuHlRmDGhfUoD147PckrnhOriXhdyc62Vn0yBKv38McQHAbS8acjmF5V9c/q/IIEQw6i27XxblfqFE4vfKINhzLV3k7WIIst+bzQIaEqiZopBped702g+6Eqxp+mzYjisfUigIjryvwTHctqFvz9JvMSfwbIj+8vGMYPh3fUkzNm71PDEcL2REiJNfAZ4eZbzyNGk7bCNxE5TG3t8rgPb+YpbV0KKicxDuUKf5KUVqxSdfyTzEnIbDaGZ0Zh91PXEYFwaChXRDX2sN5Fxdb9630ARvHkPY= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 929b6527-e41d-4f41-d8a8-08daa5911fed X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 22:46:35.2899 (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: PAXP250MB0470 Subject: [FFmpeg-devel] [PATCH 5/9] avcodec/opus_celt: Break cyclic inlusion of opus_celt.h<->opus_pvq.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: ax9n7hbax8yx Simply don't include opus_pvq.h in opus_celt.h: The latter only uses pointers to CeltPVQ. Signed-off-by: Andreas Rheinhardt --- libavcodec/opus.c | 1 + libavcodec/opus_celt.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 791e25c488..a24c38be52 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -22,6 +22,7 @@ #include #include "opus_celt.h" +#include "opus_pvq.h" #include "opustab.h" void ff_celt_quant_bands(CeltFrame *f, OpusRangeCoder *rc) diff --git a/libavcodec/opus_celt.h b/libavcodec/opus_celt.h index 291a544298..19cf617652 100644 --- a/libavcodec/opus_celt.h +++ b/libavcodec/opus_celt.h @@ -27,7 +27,6 @@ #include #include "opus.h" -#include "opus_pvq.h" #include "opusdsp.h" #include "libavutil/float_dsp.h"