From patchwork Mon Jun 14 22:31:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28269 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3240515iol; Mon, 14 Jun 2021 15:32:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIaIF2W5aBQTUbcKJcU6Mzdluh24GYpEZ82ojOSvX8kXNTXRmmU9cMyOjC6f/XaXFV8PJe X-Received: by 2002:a17:906:e104:: with SMTP id gj4mr17724435ejb.350.1623709926583; Mon, 14 Jun 2021 15:32:06 -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 w22si12465642eds.525.2021.06.14.15.32.05; Mon, 14 Jun 2021 15:32:06 -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=KRZcPwhg; 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 78DD36897E8; Tue, 15 Jun 2021 01:32:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065033.outbound.protection.outlook.com [40.92.65.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE1E9680154 for ; Tue, 15 Jun 2021 01:31:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TZ51GvkIanbZrc5BAhmIUInlykZ17/YymzyySS2WqS6f3Q0IyR1rJGg5foijVXIl9qb+P9j7kmsPs+xXRj+rfszDYzFKZB9rhD65dr3RU1N1vyMEFdYayEOKdXmwDPx1t4R6R7wG5PFDivgDYxpAZkcSR+9WrWyto6pgB5otP1SiGA/1c6XnhM40btj3qGJ4tfjpGl26bq5lNVBMMrJd3UBwp1Pa+EJUvFSgvZCXXFtqwKbQP1jwdYL1FCZofCjQAI5sAhTuAqIlW/tSw+ir6tO8XyRcOlr9rnJeUrzCl0HQzhGWyoxnnz98d4/Tuu745Ina4ivCZzLpKZofhiMktw== 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=9i3v4KIB9qPhm9w3/T4U4k5YW5hv2gIO7pPCfifmsHo=; b=FOF3w3Dn2S/xykOXFHtaX1pgDbEzN+dE1yj136PW36r/wAmv3XkUy1VnwQd+jDncchgybrvjgquSnWqUGGrK0l7GIcBSSM/OnmlD28HJMddDSy3ydus2wfDMT15WwMWaev7gLt7Gi65g52R6iTJ8Gg4rDGPPs/ItQy+vlFtSoNLlPft7xR4xHIFUb27MeaOwrErm14J8lBnKBNoFMl77D9dBCLQ/9YrKCXCdK/AKNVDWjKZqrUJXRyhoPUZ94AH/Bv2M1pBy+Dgek3DOy9VgDseUfZiz47v7rgyMilCPSzKSs7GSsiFlM/9PO8inEfE1x95O9x6CA7U9dZyqAhmTbA== 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=9i3v4KIB9qPhm9w3/T4U4k5YW5hv2gIO7pPCfifmsHo=; b=KRZcPwhgmbd/d1tOlMCQAi+v8rCFYldOO830M5lDAV7r+1rrfzO9vS3zS/RDMD/ygk6iKNXdOpKCb8rzyNHXm1pBQYYPffvB3Jj+XxBa819eEIDNcQmLbeK3DNMdDhV33ZhgtnYnZNXdq7nNioIbhxdnZHy9bjAB26pFMIFoR/6Xzn+R3V1w5RCZwZ13HMqYzv2OgHFQ54beB4ZC1IiOMAMVnQQjyDVtNbxqrQ3+27Q3rpTzAjt6gomiRLnUjPTn5dUCAXD0uNpvqK2kcb8aVG3axQ/ugSDv1ulYgdUK1hDWAPjGVIWa60/XV4QmvXi3BTCQMMtQgqDgQWNgFuao9g== Received: from HE1EUR01FT049.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e18::4f) by HE1EUR01HT057.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e18::343) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Mon, 14 Jun 2021 22:31:54 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e18::51) by HE1EUR01FT049.mail.protection.outlook.com (2a01:111:e400:7e18::221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Mon, 14 Jun 2021 22:31:53 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DF8ED4E6878B079184B6DEF89EB51674E6445B4C10509AA28A3D1EC5963D8AD0; UpperCasedChecksum:82C78CF48108D2EE42905D92C2B347D37847E410128560B7E8F0D3873CB802E7; SizeAsReceived:7379; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Mon, 14 Jun 2021 22:31:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:31:22 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [3bu4t+7IBIyzmjs2zlNICD+YI3AxNHag] X-ClientProxiedBy: AM0PR03CA0062.eurprd03.prod.outlook.com (2603:10a6:208::39) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614223138.1021131-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR03CA0062.eurprd03.prod.outlook.com (2603:10a6:208::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Mon, 14 Jun 2021 22:31:49 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2b408118-2495-4c24-7391-08d92f84335c X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULV8kH2PhGXdDTraYUwz1U+k+OZ4jXK8ISC8ChKX2wAY6MJcn9B/+5nhg/JjAkVRcAUAY0oknpub4H/V3YRe6gq8H/wiD5bMiji3S2mfFi4Zz5JW6aIH26Mf+61w9PAzu3HBHA+gKOKhWyQWjXR2NUiGM6xykj9tpV6WCsczY73WNZJCvAd2qPjWpDxFanw/vkWHGF9TWMlwKLHcb3/2yG9yYspf5jnLMykYkp9n44pqD/fNpuob9RET704Qm5Vim7iPN3Bea/iywD6ozOyQ/62EO8YVw0DdNBeJm6EUlOhZsKmPOekXcDo/t0o698Z4MwiGQCviLrNGWK+JAACaEuZLZWX8btSaIl+I+c9OyccouMyGsoh4w0FAKnYRR67qNmALRUduDoRRfqjt5uErNGXXHCs7dkgXsI5azoLfD1/LmlXe+4aUv2dVli0V/u6kwRhB5ob+THv+1FXIuMpBDJN0NRp4mxmvAvTtXgaXPB+sHotv3fyxHLycbPIC7f6KmBNIhZuhCRb5Bniq7c1o5iZo5lhnyfRlFgDOpOThdn2HlQAVa5F2v/BUdB8ultGyKXSkWO1RC/z8Uirk6E1ku/M/1yvqhOfVeIqMfNqphaYStIjzPSF0nbB8WFNGga33OKFQ1XNtoEiuNQuiakj9a/VC7caPXOBEoJq1rgwLB+SmeXRhP4Mzr1l98kMBiefbIXH9yzh57zVbg== X-MS-TrafficTypeDiagnostic: HE1EUR01HT057: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OHfB0DBYnTljOKYYqbF5q2kFjcNiVJbtk2CMIPTsew4ILf8QMMJQwRto94Xz+QFKW74P7vE9Gb1VfkpEmyUmnk8H5rSTGPIdfzeoATjVU8XyE0ec1Pd67JIZaWgqF+rvcKnMmETfHsdOQm4YGJmv5D0cmNYCC/n2dCoO/7j5bzmE9CBlsgiMYbYp18NafIiLPxeh+yFre86/eX1/nk3zr20qNWvHPh7xpsSkX3bgonOpk2+dZ2VlGiBExfG9V7Fv7Wgangu+Gnv/njzJYFUf+F3FlmUnAWDxI+foQNEcpGpTUmNI7JmWY4Mfbnd19ooG6RnIFbzLEUSHM5wRfHAitab6dFNmS75f+ECBV6Rv44HGKefJsvG2B8fy5YyoJlYHhX47jeRhH/g/IgFkgsZrrg== X-MS-Exchange-AntiSpam-MessageData: hTkfhHt3e8TWiH79ML79afXIjhLbUyMKxzXNWG2yHq5Thkf5oDoT1xZYXVfAVzRe5MhkwHNsfxDW8yM77kkZPu3R9Ys6OZVyZROsl5Hq+UxvljmvADJuQEYQviams1l0MBuk9hIBaBoPmbwMVJCIww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b408118-2495-4c24-7391-08d92f84335c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:31:50.3097 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT049.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR01HT057 Subject: [FFmpeg-devel] [PATCH 01/17] avcodec/avcodec: Stop including bsf.h in avcodec.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: ayJCgHBOgkxK Also include bsf.h directly wherever it is used. Signed-off-by: Andreas Rheinhardt --- Following the example of e67e02d15672a87da1b0566e197a1e19dc7e1e33 I have neither added an APIchanges entry nor a version bump for anything in this set. fftools/cmdutils.c | 1 + fftools/ffmpeg.h | 1 + fftools/ffmpeg_opt.c | 1 + libavcodec/avcodec.c | 1 + libavcodec/avcodec.h | 1 - libavcodec/bitstream_filters.c | 6 +++--- libavcodec/cbs_bsf.c | 1 + libavcodec/decode.c | 1 + libavcodec/internal.h | 1 + libavcodec/opus_metadata_bsf.c | 1 + libavcodec/pcm_rechunk_bsf.c | 1 + libavformat/av1dec.c | 1 + libavformat/concatdec.c | 1 + libavformat/internal.h | 1 + libavformat/mux.c | 1 + libavformat/tee.c | 1 + libavformat/utils.c | 1 + 17 files changed, 18 insertions(+), 4 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4148285971..f72231790f 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -53,6 +53,7 @@ #include "libavutil/cpu.h" #include "libavutil/ffversion.h" #include "libavutil/version.h" +#include "libavcodec/bsf.h" #include "cmdutils.h" #if HAVE_SYS_RESOURCE_H #include diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index e9d30fbd67..b424f914e9 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -31,6 +31,7 @@ #include "libavformat/avio.h" #include "libavcodec/avcodec.h" +#include "libavcodec/bsf.h" #include "libavfilter/avfilter.h" diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index a63bed54cf..6dbe638433 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -27,6 +27,7 @@ #include "libavformat/avformat.h" #include "libavcodec/avcodec.h" +#include "libavcodec/bsf.h" #include "libavfilter/avfilter.h" diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index d369b30bbc..3b3a3ef05a 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -32,6 +32,7 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "avcodec.h" +#include "bsf.h" #include "decode.h" #include "encode.h" #include "frame_thread_encoder.h" diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dabd60386e..f6d2cde441 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -41,7 +41,6 @@ #include "libavutil/pixfmt.h" #include "libavutil/rational.h" -#include "bsf.h" #include "codec.h" #include "codec_desc.h" #include "codec_par.h" diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index e03326515b..d565286397 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" +#include +#include -#include "libavutil/common.h" #include "libavutil/log.h" -#include "avcodec.h" +#include "bsf.h" #include "bsf_internal.h" extern const AVBitStreamFilter ff_aac_adtstoasc_bsf; diff --git a/libavcodec/cbs_bsf.c b/libavcodec/cbs_bsf.c index 0977d431f7..86ec3f2a4d 100644 --- a/libavcodec/cbs_bsf.c +++ b/libavcodec/cbs_bsf.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "bsf.h" #include "bsf_internal.h" #include "cbs_bsf.h" diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 75bc7ad98e..6def4047e5 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -40,6 +40,7 @@ #include "avcodec.h" #include "bytestream.h" +#include "bsf.h" #include "decode.h" #include "hwconfig.h" #include "internal.h" diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 975ec0ba30..d8fb054832 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -32,6 +32,7 @@ #include "libavutil/mathematics.h" #include "libavutil/pixfmt.h" #include "avcodec.h" +#include "bsf.h" #include "config.h" /** diff --git a/libavcodec/opus_metadata_bsf.c b/libavcodec/opus_metadata_bsf.c index 723e31c243..e73852d618 100644 --- a/libavcodec/opus_metadata_bsf.c +++ b/libavcodec/opus_metadata_bsf.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "bsf.h" #include "bsf_internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavcodec/pcm_rechunk_bsf.c b/libavcodec/pcm_rechunk_bsf.c index 47f44b6467..32a90cd2f7 100644 --- a/libavcodec/pcm_rechunk_bsf.c +++ b/libavcodec/pcm_rechunk_bsf.c @@ -19,6 +19,7 @@ */ #include "avcodec.h" +#include "bsf.h" #include "bsf_internal.h" #include "libavutil/avassert.h" #include "libavutil/opt.h" diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 8ca804c2a3..be6808f5c4 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -25,6 +25,7 @@ #include "libavutil/fifo.h" #include "libavutil/opt.h" #include "libavcodec/av1_parse.h" +#include "libavcodec/bsf.h" #include "avformat.h" #include "avio_internal.h" #include "internal.h" diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 6d77398f48..20912e797e 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/timestamp.h" +#include "libavcodec/bsf.h" #include "avformat.h" #include "internal.h" #include "url.h" diff --git a/libavformat/internal.h b/libavformat/internal.h index c6adf7b872..2919080801 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -26,6 +26,7 @@ #include "libavutil/bprint.h" #include "libavcodec/avcodec.h" +#include "libavcodec/bsf.h" #include "avformat.h" #include "os_support.h" diff --git a/libavformat/mux.c b/libavformat/mux.c index d719e16283..6fa1c5495b 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -21,6 +21,7 @@ #include "avformat.h" #include "internal.h" +#include "libavcodec/bsf.h" #include "libavcodec/internal.h" #include "libavcodec/packet_internal.h" #include "libavutil/opt.h" diff --git a/libavformat/tee.c b/libavformat/tee.c index f33cbea98c..759535bdea 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -23,6 +23,7 @@ #include "libavutil/avutil.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" +#include "libavcodec/bsf.h" #include "internal.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index 0df14682a4..6b117e5223 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -35,6 +35,7 @@ #include "libavutil/time.h" #include "libavutil/timestamp.h" +#include "libavcodec/bsf.h" #include "libavcodec/bytestream.h" #include "libavcodec/internal.h" #include "libavcodec/packet_internal.h"