From patchwork Mon Aug 2 15:39:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29196 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679724ioh; Mon, 2 Aug 2021 08:40:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuSSNooMrlREnpfOmNP5q+sYapLe7I7TBTzuFcQ6vIF9aSjIse3XYBh/uel3yDBRglxwst X-Received: by 2002:a17:907:2674:: with SMTP id ci20mr16434593ejc.84.1627918830543; Mon, 02 Aug 2021 08:40:30 -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 j7si12055404ejm.280.2021.08.02.08.40.30; Mon, 02 Aug 2021 08:40:30 -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=sZzGFyHw; 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 93FEE689E3A; Mon, 2 Aug 2021 18:39:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075102.outbound.protection.outlook.com [40.92.75.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2DA8680836 for ; Mon, 2 Aug 2021 18:39:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BrQPFbdl+lugeDHVdtWs7dw6qWpnO5DZCb50HA8arV7HuYW4RMF5mOLCEqC469kZQpsI99hPVUGH0O7ylBlh+XOPABpVLsZPxgXfdGps9M7NiO9S7T/APiHqWdYV7WD70RjC1fxtg5LYv3SL+lZ5SEBqKG9MyDOtdPXGEVDPRIM/tzGfp3I0UrARFvM216oi+QpUQqVOKxSqX84rl9fT4QKiBF0MmU+PwhydAx4CMkgjTzDEe9WkBEkp6MePpzyGZfE57PvwNZxoDLAOqOZDjX59jFoBoxV6UQ9p4ug2snKuxO3VXzr6zCp38wxd+PR1CVAyU2r0sWR7xB1Idyv0mQ== 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-SenderADCheck; bh=EA60qJ6lNq6CkN/TG51ZebVRV9IrK0hhqeXeajMHga8=; b=gliv7wsoyV6VKf+CwF25pyCq8PKiXnlW7YiU70c/rAn6pS6TmL8kD/Vihh0b5+KMQr66970Ti9eCA4RlF/cHv9BLV/RpBnH8c9e9JPGNMa1l35L2SODVNjs4/AxDgvGjULjDqn1ItNctqX12owtl2YZQ0dEiJEmu2IUnDQ1g2ZrGqtDnmsOuDWS7uihTtcucw5CGwNZZqMzLBMDAtuJwZ8U+gC5UimVqwqRWg91H/5TO/XKeN06xEWnBmadCRhYK9koMM/uxfASRya4/UUEZfUMm47CsOCf++nXT2YhWRzqixbpXBUwWX6NpaCSvUUT4qEnr/sFvSANtMmY+SL4ggA== 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=EA60qJ6lNq6CkN/TG51ZebVRV9IrK0hhqeXeajMHga8=; b=sZzGFyHwVropeYEzUN8fVR/ybvdKWcoYGSQGXDEQtqnHdYef45hGFBDTczfdE/PFZwJ+i1BQH7sVUFUyPDXv8jdh44ASTDo9hHHctyNPtzr3uDqyMskoXFP7sgSgHpkXdVWpkd5PooAm/6O69y279Kc0JcVZ1gIPwCx/CpnyKg3SbuUpDyZl7eKpyNG+ekPzmG72YEB1Ifthy1dJEvhf97OonTkZHlocD0Aj/3aux3rU00vlbD3m17UOD7lgab1OYBApm+PqgmvZ7mCWbaLxTqa/c/tH9bqqH9zV/20axFWxwI2TzCP2b1mJbtX3CI6hhh6L/BI7nBtc/98DWBkBXg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3092.eurprd03.prod.outlook.com (2603:10a6:206:19::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.19; Mon, 2 Aug 2021 15:39:39 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 15:39:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:13 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ooJV97+yA1WrhJLuBF0UYF6Fj/3WU+hm] X-ClientProxiedBy: PR3P193CA0056.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::31) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210802153915.1234499-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by PR3P193CA0056.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.31 via Frontend Transport; Mon, 2 Aug 2021 15:39:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fafd9a7-230c-4d79-dbd8-08d955cbbd19 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT7FzPiew9v5CevtIP+WXD7qLwzOECtmPmGfZRIc9nIj6DBFaS/UqUGNo0RuWDVuurIa3AA2trjv0oVrEav/uyWMipl2PGdNsCkOInhuDfBph90s6OXlV2KqHrvbGDuUtbmHOAPBB13eS6IIMVemDIwQexsFji8unmOTagywiwP/sAaP20pMVS/J485qfXmlX0OOQHvPcQaLnjLzbgrpSxtwvpdtfFncY3rTkyeKpy9SHNwhjFYZYw6/v7qLSkuWRv2L1BKWMeDFP414TxEaj4RkyyuP/1ZHWbIz8H0MMxDgIXNUZ1ZATTMPV+BxeKtUTfVpReX8pOFsPqONLvZ4USU4unNmBJCa2CCdmbOm19zAx3xIIt++V2DuMHD8hDybGTr6gu3pXFKz5ZCACyXhFBapTNDFL2yjXopV0DYo1GFhEG7LZ7e3FOli3mNqbbtj2MKHn3rr+sNAsXJ5S2ZQnDRKmhiaO6pRCmOeb1dLMpj9D/tmW8Qq9T8cbRjoo6x4JBAguENHRFBCyFQmpOQZaithBBAXyVJk3iRNNaRl/wwJF6rz+TUkEAhfYLMB2P3NHUKaVpeKcobLy7Hw7iG/A1SPe4eiK45AMspDMa1VmvkCrMmc1oddjkEb3+8yGCIxVdEb/FTlZW+ym2o/nivApjMuxx9bb3QDrT8LhIzaUqBpMviJmKj7P0GgIhMiCcGXgQJl3qIRsgokxbX1+f1uCua4k6JzhwGgCc5kJyAZ74NsBgVhiDmB0v76LwPqR4SiJs= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X7eln7wl+60uq7ra4YWLdyC/patUaWC4L6lt4HnhaDGf78Wt3qeuhPFipR3/naxLS2cdveNHDTigz4/wZIdTkSnxFEs0urjE0bZXHRi6yWgnkRajGYpBg+Ei+atjodIiFrXEW6b4xFNJaNIwUf4cOUxZ52Xzc+cyEKfgsE4CNEZ/axOekde8H337d3q8B25fEMtZPhPEe9hHZeTZ6BvCg55xqNDzabR39D5fx1WEpWHU9glvJFUReNxSiV9y+G/DKZ9x8mX1J9v/S9AcJ6KEfLFxy4cSeDqofBsl+F0nzsx1VZBPX5VuBC8q0dO1go/Sxas6IulOi/WA1D/yjX/0x7JvMkxUmDPRIBfzlxbQ7/empagCnMPcxfkt51/CQxvMwzepiaZPPkTwR6KZpcOBFC2HsQyK3+Vy6jaO7+U+ZSGPBAXUXO6Qx2WL2z5UB4nw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /0RQxusPMXaEPr7610/9RPSSWL3y0xbGW6qFwNrjY9je4jEZRvOOqTsyZLtNLwhKN35YICBazDYzmklYA7X7+HT7Gau3P8ewdOR9JeVMmJt0Eu3L73TjTxdx7kZXgymzs5QOxP7bYT1hkxmhP2G7Uw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fafd9a7-230c-4d79-dbd8-08d955cbbd19 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 15:39:39.0818 (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: AM5PR03MB3092 Subject: [FFmpeg-devel] [PATCH 08/10] avfilter/internal: Don't include libavcodec/(avcodec|internal).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: xDWGE0mPoeY2 The reasons for including them don't exist any longer: ff_tlog() has been moved to libavutil/internal.h and FF_QSCALE_TYPE_* has been moved to qp_table.h. Signed-off-by: Andreas Rheinhardt --- The following headers are now no longer provided by libavfilter/internal.h: libavcodec/avcodec.h libavcodec/codec.h libavutil/hwcontext.h libavcodec/codec_id.h libavcodec/codec_desc.h libavcodec/codec_par.h libavcodec/defs.h libavcodec/packet.h libavcodec/version.h libavcodec/internal.h libavutil/channel_layout.h libavutil/fifo.h libavcodec/bsf.h libavfilter/af_ashowinfo.c | 2 ++ libavfilter/dnn/dnn_backend_tf.c | 1 + libavfilter/internal.h | 2 -- libavfilter/vf_uspp.c | 1 + libavfilter/vf_vpp_qsv.c | 1 + libavfilter/vf_yadif_cuda.c | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index db8aa029c4..72d795f8ee 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -37,6 +37,8 @@ #include "libavutil/timestamp.h" #include "libavutil/samplefmt.h" +#include "libavcodec/defs.h" + #include "audio.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 6443c2fd1d..ac609ab9cb 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -31,6 +31,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/cpu.h" +#include "libavcodec/defs.h" #include "../internal.h" #include "dnn_backend_native_layer_pad.h" #include "dnn_backend_native_layer_maximum.h" diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 61a1279b2f..6a4c546b4b 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -32,8 +32,6 @@ #include "thread.h" #include "version.h" #include "video.h" -#include "libavcodec/avcodec.h" -#include "libavcodec/internal.h" typedef struct AVFilterCommand { double time; ///< time expressed in seconds diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index b70d48e515..7029963e29 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -32,6 +32,7 @@ #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavcodec/avcodec.h" #include "internal.h" #include "qp_table.h" #include "avfilter.h" diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 11ee490935..9390c80dda 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/eval.h" +#include "libavutil/hwcontext.h" #include "libavutil/pixdesc.h" #include "libavutil/mathematics.h" diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c index 5099f0a806..95267d6a1c 100644 --- a/libavfilter/vf_yadif_cuda.c +++ b/libavfilter/vf_yadif_cuda.c @@ -19,6 +19,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/hwcontext.h" #include "libavutil/hwcontext_cuda_internal.h" #include "libavutil/cuda_check.h" #include "internal.h"