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" From patchwork Mon Jun 14 22:41:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28286 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp3249157ybk; Mon, 14 Jun 2021 15:41:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBOfZERPQZsgaiiS1CcLYrK2vrSzyWhhTtAAwMteP1rcMdi4q1t0yIGPSkwVm2gOvTCdTM X-Received: by 2002:a17:906:39d7:: with SMTP id i23mr17247442eje.121.1623710518871; Mon, 14 Jun 2021 15:41:58 -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 9si9364890ejd.281.2021.06.14.15.41.58; Mon, 14 Jun 2021 15:41:58 -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="hPe8E/RG"; 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 97CE36897E8; Tue, 15 Jun 2021 01:41:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2044.outbound.protection.outlook.com [40.92.51.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFD37680618 for ; Tue, 15 Jun 2021 01:41:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iJcJj5JOQrEpBU+uEOOvyKclEx3MwQbeT9ZYLa7OiR2TNBWcL2sgJav3fyEsKuRJNHvr4ANf3byJpmIT+zod3eyKNpLi+MP27TwO3K7QdROXyRFiWpIPjgKWNPaUwue0xx/4v1jjUMSaCILXNCGNJH8Gz5FhdQIcJwX4lbgI3avX0BUairpK2xZ2zhop4FUkIhSt4+47vHDJjBNdR7GMUoQo9QAk1t++YU3mKQEaMPpEMwHLfCSQVOQ3owtnrxd0MmAXVIFiMIFPFV8HN4X4pDdktrXhCCazMoDoALHqpXFTnpas+03Jm2ru5MKSqoFnRV35QuvoAXxGyJRM8Gdsvg== 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=VtFu3v0NWYU3UcfWBDbRtwcFFfJn5G2g754i9Rvq8E8=; b=IE3TiQTQw7/7ZglLz1Crj5shrvb9TrOryE65YMMqGwmMBhgln0dDqk+F47lNArz+5+C3fDpxIfBdGjSkJCnqubbJO2tWGRKzO5x/ZUkJ+OowUhxSAY0l6mNJGJTWAEQIZXzw4sgHSrQITmPG2ee3y5XpLeAa9BB8WDIp1WElfP6RV+FcrmQ3Ax94RHStJC6HU7yS4oUBzH2BtFJGEUN98ZfYT3FHyOK4P94Uy7nRGLZHKFTmzblUjvUukx6hncFOu6JCgIchMjToCmcRS1KgzVjAETOLyH5gm1O9NPFKG78jQ6HHETADsHGeU4k/io/qEqkjPC4Bj89fvIeYV4ftuQ== 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=VtFu3v0NWYU3UcfWBDbRtwcFFfJn5G2g754i9Rvq8E8=; b=hPe8E/RGg/RGuU85bw5kjlLwCI23Mqwo4biP/D5dYPMsMREEJx6zZRwFUIsVw2lqebol2Cds/1OTPSq1duGRzdyNjC+uzue+hrcSaDr1LtgIYSf6EA1lW/RzOifjLPdgL8ITJoFKcfYPdG9RqXvYwznQP11gbgrSlVD+RPCYAvalxlAKu6xCCYsStPyU7becRyIF5mlzTadoHnJhbFSgthzhWbLxT1mDpcxhzi5SN7d1cHSAN0F0+21LxNFKW/mIS0fPX6oxeyZb3ODVBmq8GqDc8Yk74NjAihDep7boTwiyxQ3l210LXuH7cBWlnIg3DTV2gfTDqsdObhs6UrhtBA== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::43) by DB8EUR06HT118.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::447) 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:41:42 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:41:42 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7DBB8B4C08138F33B6336828F3D89BB8792CEAC89A7BF58C7E58CBB3E29A4342; UpperCasedChecksum:147DCE78228A85E0F4940E3D21162FAB65B2B6204A063A64041114DF64D80956; SizeAsReceived:7605; Count:48 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:41:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:18 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [5c5fUzNJ98JkoLZz0JX+f86W5H/qI8nP] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:41:41 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ac9515b0-a299-4da6-54c6-08d92f859436 X-MS-Exchange-SLBlob-MailProps: VCKv1Cle4b3co6Dq8ohnXJ2DV3m4TXE1F2YhEkWEzJ1QWUBfq2P1cntACLghMajvUzeOdQ0/Z49fDvK704opMqPqxUk8NZdn7T82G1UfABvZneV2adSDubHATAc2ewtP/m7GFqm11OgSRZZy0njDIn3mvQLfaY16NRrYvMz3NmqHA21Z8dy7ONa/potWeskDF7WziTNWHfldPRCDkjo5IjiueIVxQtMZrZPrIgnoUmNDtiyYcmC3jG/nqcd/cwY+JGMMHTwAarQNYNhdYxpjoJLUelsWGWZJi5JIxM/7v8rS8ij0WJVSmihxkgGVxysPRlsLhIuI7QLtfLWspJZhXhEZJhE4uU1I2cQYtmwDAIv4dDthYFMKi2hUQF7pbcvCCZgohKw9EbpwcVIxzYiIZqBuGSuHMzTucJQjEfQ9eSEAZ7ikOCrJWhR7ccStiFqfUpeyfFadbI09PxFjKSDFkyblRRroN/zBOkI0TUuLXkKtfaWdV8he50XD8fUVjdfs3/xDyNS0XngK1/001wdvhnXsCMZsMM7Xr21n7AL1bA36rMoEk49rvf9UMsVjlILIfAGdLGDmvpdlKXySeJlTRCkLvwf38xFT+KdvIYBoL/YgWjZX0NP/LQ2QndixjREV3p1eIwGwFxgP57HZgqN8gq202H0pX8Bezo5XqaiVRQBJ5pPx7RmkMFsRY+AH30CRmnPZ1Wtd2vjQcliQFsxsN607IynOiUN9G1KZQD930tH395p1dm1fR+/JdbfiN7mjw+QptZAwL9XI5MZjdZmb9+51PEJDATdGXG3jop2aNVMUl5b7+Zwtaegib7iTUpE2swXmUsQy3VcM8pt947zhJ9D2AX6cqKitnSXQA9h/NZSjh1kXn0w0FKaXizfWjJKHhw/yQwiCuDhHpwWl0trYPU/vPZKNHO3KHS92q8/712ERVWxj8v7IAZ8IGdau5nDx0hcroWbNtPSTd2Wfuk+He59ASjbwHYgVtoPsn+5RmaYNWyPJAjrIVRAeSWwJkHyPtNSYlb3QX5qzhEbCi6wuxJzEXt0hwUJ272nF1cNcmsc= X-MS-TrafficTypeDiagnostic: DB8EUR06HT118: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1oxAtmnz6XzkRq7o8F+QhAYPtp+6yGpf00hBGcDR78amyM1Ino9WbRPoNCEqToKUy57G34MkukgZv7L2GHWK4ZYqZAMRtOQxxQGTPm7DiBzl1zQs6xBah2oALQUzq9WqK89h4qlxXMokv3afacqycDd5nBgDtoJlSXCN/nzDkRdM8e6MqDNFhemvjKY0JS9umBwEk6YBx4eDkGTeiCIkEHlFTFfC2pS5sgInsSJ2vv5T80x4MCPgvk7vkr5FiXV1mGvhCvzmQVei2tfR43BmqHZknVccaZX9gx8MXcgzUfKVWQXcheisvhf1oEA1HYcD3Y8bwPeRst6uynzHXwOnK7qMZotcMCbZivGUQMjQPgMF/R4SGyTezDusmQf4e0Fq/g3SZjW4GpjTD3yreDzGGM2TH8501/607pyW6LnY1aqICGxMcX7q75V3AjlNec3SuHVufSokwWj4dXN0/8Kl+g== X-MS-Exchange-AntiSpam-MessageData: n0H3EOccqtVhHvJJLF1oxpw1IaOZa/paekiVRctjsC6EofbU8yVTqgEcMUndymAJTK8pPIoZ22SeEICvcocJ2s3gIxrMFfySKsWYobOFDJF2GRSt/2serW7O0jwTIsAQRMl8up0er6/ZzTkmy1ZGXA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac9515b0-a299-4da6-54c6-08d92f859436 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:41.6888 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT118 Subject: [FFmpeg-devel] [PATCH 02/17] avcodec/avcodec: Stop including channel_layout.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: gPkyhZtdXvMB Content-Length: 37863 Also include channel_layout.h directly wherever used. Signed-off-by: Andreas Rheinhardt --- doc/examples/filtering_audio.c | 1 + doc/examples/transcode_aac.c | 1 + doc/examples/transcoding.c | 1 + fftools/cmdutils.c | 1 + fftools/ffplay.c | 1 + fftools/ffprobe.c | 1 + libavcodec/aacdec_template.c | 1 + libavcodec/aacenc.c | 1 + libavcodec/aacenc.h | 1 + libavcodec/aacenctab.h | 1 + libavcodec/aptxdec.c | 1 + libavcodec/aptxenc.c | 1 + libavcodec/atrac9dec.c | 1 + libavcodec/audiotoolboxdec.c | 1 + libavcodec/audiotoolboxenc.c | 1 + libavcodec/avcodec.c | 1 + libavcodec/avcodec.h | 1 - libavcodec/dca_core.c | 1 + libavcodec/dca_xll.c | 1 + libavcodec/decode.c | 1 + libavcodec/dolby_e.c | 1 + libavcodec/dolby_e_parser.c | 1 + libavcodec/dvaudiodec.c | 1 + libavcodec/encode.c | 1 + libavcodec/evrcdec.c | 1 + libavcodec/flacenc.c | 1 + libavcodec/g722enc.c | 1 + libavcodec/ilbcdec.c | 1 + libavcodec/libcodec2.c | 1 + libavcodec/libgsmenc.c | 1 + libavcodec/libopusenc.c | 1 + libavcodec/libshine.c | 1 + libavcodec/libtwolame.c | 1 + libavcodec/libvorbisenc.c | 1 + libavcodec/mlp.c | 1 + libavcodec/mlpenc.c | 1 + libavcodec/mpegaudioenc_fixed.c | 1 + libavcodec/mpegaudioenc_float.c | 1 + libavcodec/opus.c | 1 + libavcodec/opusenc.c | 1 + libavcodec/pafaudio.c | 1 + libavcodec/pcm-dvdenc.c | 1 + libavcodec/ra144enc.c | 1 + libavcodec/s302m.c | 1 + libavcodec/s302menc.c | 1 + libavcodec/sbcdec.c | 1 + libavcodec/sbcenc.c | 1 + libavcodec/siren.c | 1 + libavcodec/tak.c | 1 + libavcodec/tta.c | 1 + libavcodec/utils.c | 1 + libavcodec/wavpackenc.c | 1 + libavdevice/avfoundation.m | 1 + libavdevice/pulse_audio_enc.c | 1 + libavfilter/af_afir.c | 1 + libavfilter/af_apulsator.c | 1 + libavfilter/af_biquads.c | 1 + libavfilter/af_firequalizer.c | 1 + libavfilter/af_hdcd.c | 1 + libavfilter/af_speechnorm.c | 1 + libavfilter/asrc_afirsrc.c | 1 + libavfilter/asrc_anoisesrc.c | 1 + libavfilter/asrc_hilbert.c | 1 + libavfilter/asrc_sinc.c | 1 + libavfilter/avf_showcqt.c | 1 + libavfilter/src_movie.c | 1 + libavfilter/tests/formats.c | 1 + libavformat/alp.c | 2 ++ libavformat/apm.c | 1 + libavformat/argo_asf.c | 1 + libavformat/argo_cvg.c | 2 ++ libavformat/codec2.c | 1 + libavformat/derf.c | 1 + libavformat/dsfdec.c | 1 + libavformat/eacdata.c | 1 + libavformat/framehash.c | 1 + libavformat/fwse.c | 1 + libavformat/genh.c | 1 + libavformat/ifv.c | 1 + libavformat/imx.c | 1 + libavformat/isom.c | 1 + libavformat/kvag.c | 2 ++ libavformat/libopenmpt.c | 1 + libavformat/movenc.c | 1 + libavformat/mpeg.c | 1 + libavformat/pp_bnk.c | 1 + libavformat/riffenc.c | 1 + libavformat/sbgdec.c | 1 + libavformat/sga.c | 1 + libavformat/wsddec.c | 1 + libswresample/options.c | 1 + libswresample/swresample_frame.c | 1 + tests/api/api-flac-test.c | 1 + 93 files changed, 95 insertions(+), 1 deletion(-) diff --git a/doc/examples/filtering_audio.c b/doc/examples/filtering_audio.c index 508c19c60b..2af73a7031 100644 --- a/doc/examples/filtering_audio.c +++ b/doc/examples/filtering_audio.c @@ -34,6 +34,7 @@ #include #include #include +#include #include static const char *filter_descr = "aresample=8000,aformat=sample_fmts=s16:channel_layouts=mono"; diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index 711076b5a5..1cf6317e27 100644 --- a/doc/examples/transcode_aac.c +++ b/doc/examples/transcode_aac.c @@ -38,6 +38,7 @@ #include "libavutil/audio_fifo.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/frame.h" #include "libavutil/opt.h" diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c index 3a97426e2c..51c120dfb7 100644 --- a/doc/examples/transcoding.c +++ b/doc/examples/transcoding.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index f72231790f..553ef0fe4f 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -41,6 +41,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" +#include "libavutil/channel_layout.h" #include "libavutil/display.h" #include "libavutil/mathematics.h" #include "libavutil/imgutils.h" diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 826c3ba5b4..833830bfc8 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -31,6 +31,7 @@ #include #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/eval.h" #include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 2d452c212e..9ca28c93e7 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -33,6 +33,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" +#include "libavutil/channel_layout.h" #include "libavutil/display.h" #include "libavutil/hash.h" #include "libavutil/hdr_dynamic_metadata.h" diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index d78e60ec2e..fd46a7d222 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -89,6 +89,7 @@ Parametric Stereo. */ +#include "libavutil/channel_layout.h" #include "libavutil/thread.h" static VLC vlc_scalefactors; diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 23bfa20eaf..e462566078 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -30,6 +30,7 @@ ***********************************/ #include +#include "libavutil/channel_layout.h" #include "libavutil/libm.h" #include "libavutil/float_dsp.h" #include "libavutil/opt.h" diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 8ffc94f99b..b106910ce0 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -22,6 +22,7 @@ #ifndef AVCODEC_AACENC_H #define AVCODEC_AACENC_H +#include "libavutil/channel_layout.h" #include "libavutil/float_dsp.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h index dbbdf61dfd..f54dd16bed 100644 --- a/libavcodec/aacenctab.h +++ b/libavcodec/aacenctab.h @@ -28,6 +28,7 @@ #ifndef AVCODEC_AACENCTAB_H #define AVCODEC_AACENCTAB_H +#include "libavutil/channel_layout.h" #include "aac.h" /** Total number of usable codebooks **/ diff --git a/libavcodec/aptxdec.c b/libavcodec/aptxdec.c index e7e5459bbf..bdcc076c41 100644 --- a/libavcodec/aptxdec.c +++ b/libavcodec/aptxdec.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "aptx.h" /* diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c index 733ebc42c3..5ea6053c26 100644 --- a/libavcodec/aptxenc.c +++ b/libavcodec/aptxenc.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "aptx.h" #include "encode.h" diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index eebb412145..1063044815 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/thread.h" #include "internal.h" diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index cbd381ef12..a222cde62e 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -29,6 +29,7 @@ #include "internal.h" #include "mpegaudiodecheader.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/log.h" diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index f599802b7b..9245aa9dc4 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -33,6 +33,7 @@ #include "internal.h" #include "libavformat/isom.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/log.h" diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 3b3a3ef05a..6d60026c07 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -27,6 +27,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" +#include "libavutil/channel_layout.h" #include "libavutil/imgutils.h" #include "libavutil/mem.h" #include "libavutil/opt.h" diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f6d2cde441..292c373c68 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -33,7 +33,6 @@ #include "libavutil/avutil.h" #include "libavutil/buffer.h" #include "libavutil/cpu.h" -#include "libavutil/channel_layout.h" #include "libavutil/dict.h" #include "libavutil/frame.h" #include "libavutil/hwcontext.h" diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index accc5efd51..f0a3c18d62 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "dcaadpcm.h" #include "dcadec.h" #include "dcadata.h" diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index d265cab8df..ab14dbcc88 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "dcadec.h" #include "dcadata.h" #include "dcamath.h" diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6def4047e5..71c76d33b2 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -30,6 +30,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/frame.h" #include "libavutil/hwcontext.h" diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index cd4c8c2c3c..6c0d54be4c 100644 --- a/libavcodec/dolby_e.c +++ b/libavcodec/dolby_e.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/float_dsp.h" #include "libavutil/thread.h" #include "libavutil/mem.h" diff --git a/libavcodec/dolby_e_parser.c b/libavcodec/dolby_e_parser.c index ab8f1b6ef1..23bddd14f3 100644 --- a/libavcodec/dolby_e_parser.c +++ b/libavcodec/dolby_e_parser.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "dolby_e.h" #include "get_bits.h" diff --git a/libavcodec/dvaudiodec.c b/libavcodec/dvaudiodec.c index e12f43c485..82e6dbe36c 100644 --- a/libavcodec/dvaudiodec.c +++ b/libavcodec/dvaudiodec.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/encode.c b/libavcodec/encode.c index a569904f2c..98dfbfdff3 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -20,6 +20,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/frame.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" diff --git a/libavcodec/evrcdec.c b/libavcodec/evrcdec.c index 75de6cf803..59fcb14c52 100644 --- a/libavcodec/evrcdec.c +++ b/libavcodec/evrcdec.c @@ -25,6 +25,7 @@ * @author Paul B Mahol */ +#include "libavutil/channel_layout.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index de36d33333..595928927d 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -20,6 +20,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/intmath.h" #include "libavutil/md5.h" diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index bb011fb81b..75b926ef8e 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -28,6 +28,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "encode.h" #include "internal.h" diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c index 3df46b242f..4d0465087f 100644 --- a/libavcodec/ilbcdec.c +++ b/libavcodec/ilbcdec.c @@ -30,6 +30,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "internal.h" #include "get_bits.h" diff --git a/libavcodec/libcodec2.c b/libavcodec/libcodec2.c index 2996dc42f5..ab9250143b 100644 --- a/libavcodec/libcodec2.c +++ b/libavcodec/libcodec2.c @@ -20,6 +20,7 @@ */ #include +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "libavutil/opt.h" #include "encode.h" diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index 97ba789046..a2f6c1c62e 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -34,6 +34,7 @@ #include #endif +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "avcodec.h" diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 6602500f26..82002ac346 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -22,6 +22,7 @@ #include #include +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index 04d5914701..fbc84846ae 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -21,6 +21,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "audio_frame_queue.h" #include "avcodec.h" diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index 1f6808b6f5..a71febc91f 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -26,6 +26,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index ec674695d4..fa0d5f4b42 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -21,6 +21,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/fifo.h" #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavcodec/mlp.c b/libavcodec/mlp.c index 74363c3b95..dcec145eb0 100644 --- a/libavcodec/mlp.c +++ b/libavcodec/mlp.c @@ -21,6 +21,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" #include "libavutil/thread.h" diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 7693feb127..8b61fc6b1e 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -25,6 +25,7 @@ #include "internal.h" #include "put_bits.h" #include "audio_frame_queue.h" +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/avstring.h" #include "libavutil/samplefmt.h" diff --git a/libavcodec/mpegaudioenc_fixed.c b/libavcodec/mpegaudioenc_fixed.c index ce8963fd0b..fb1ba4e1bf 100644 --- a/libavcodec/mpegaudioenc_fixed.c +++ b/libavcodec/mpegaudioenc_fixed.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "mpegaudioenc_template.c" const AVCodec ff_mp2fixed_encoder = { diff --git a/libavcodec/mpegaudioenc_float.c b/libavcodec/mpegaudioenc_float.c index ba3b096579..accb909a6f 100644 --- a/libavcodec/mpegaudioenc_float.c +++ b/libavcodec/mpegaudioenc_float.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #define USE_FLOATS 1 #include "mpegaudioenc_template.c" diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 64de246720..5ca6ca92f3 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -26,6 +26,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/error.h" #include "libavutil/ffmath.h" diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c index 7b22b929f7..b7f4760a25 100644 --- a/libavcodec/opusenc.c +++ b/libavcodec/opusenc.c @@ -25,6 +25,7 @@ #include "opusenc_psy.h" #include "opustab.h" +#include "libavutil/channel_layout.h" #include "libavutil/float_dsp.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavcodec/pafaudio.c b/libavcodec/pafaudio.c index cb80f3a186..969eb7fa97 100644 --- a/libavcodec/pafaudio.c +++ b/libavcodec/pafaudio.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index ae7de65f1d..c9afac69d2 100644 --- a/libavcodec/pcm-dvdenc.c +++ b/libavcodec/pcm-dvdenc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "bytestream.h" #include "encode.h" diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 4d12294c97..7a96354633 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -27,6 +27,7 @@ #include +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "audio_frame_queue.h" #include "celp_filters.h" diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c index 60d1547884..b09c1293a0 100644 --- a/libavcodec/s302m.c +++ b/libavcodec/s302m.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "libavutil/log.h" diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index 33633627f6..528d712e79 100644 --- a/libavcodec/s302menc.c +++ b/libavcodec/s302menc.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "encode.h" #include "internal.h" diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c index db61f43a5a..e14d8c8958 100644 --- a/libavcodec/sbcdec.c +++ b/libavcodec/sbcdec.c @@ -32,6 +32,7 @@ #include "avcodec.h" #include "internal.h" +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem_internal.h" #include "sbc.h" diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c index 5f9a214a1a..45156277b7 100644 --- a/libavcodec/sbcenc.c +++ b/libavcodec/sbcenc.c @@ -30,6 +30,7 @@ * SBC encoder implementation */ +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avcodec.h" #include "encode.h" diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 5937f0d56c..87464808a4 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/tx.h" #include "libavutil/float_dsp.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/tak.c b/libavcodec/tak.c index 8aa956b661..7221a80094 100644 --- a/libavcodec/tak.c +++ b/libavcodec/tak.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" diff --git a/libavcodec/tta.c b/libavcodec/tta.c index f628071ba3..d9ff45fad6 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -29,6 +29,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 342709353f..0b12ae2930 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -28,6 +28,7 @@ #include "config.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index bd548a5c30..dc4f4e303b 100644 --- a/libavcodec/wavpackenc.c +++ b/libavcodec/wavpackenc.c @@ -20,6 +20,7 @@ #define BITSTREAM_WRITER_LE +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index bad3760159..5f46c97596 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -28,6 +28,7 @@ #import #include +#include "libavutil/channel_layout.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "libavutil/avstring.h" diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c index bfd7be4f37..4ff425d33f 100644 --- a/libavdevice/pulse_audio_enc.c +++ b/libavdevice/pulse_audio_enc.c @@ -23,6 +23,7 @@ #include #include "libavformat/avformat.h" #include "libavformat/internal.h" +#include "libavutil/channel_layout.h" #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/time.h" diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 26d61d4c0f..309eb3dd2e 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -26,6 +26,7 @@ #include #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c index 6be61eb905..56ff4579d6 100644 --- a/libavfilter/af_apulsator.c +++ b/libavfilter/af_apulsator.c @@ -19,6 +19,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index c477906f87..0baf5541fd 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -63,6 +63,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/ffmath.h" #include "libavutil/opt.h" #include "audio.h" diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index c0b7b1aa4d..a4de76ee0f 100644 --- a/libavfilter/af_firequalizer.c +++ b/libavfilter/af_firequalizer.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/eval.h" #include "libavutil/avassert.h" diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c index badac0cce6..144c0d31ed 100644 --- a/libavfilter/af_hdcd.c +++ b/libavfilter/af_hdcd.c @@ -43,6 +43,7 @@ * HDCD decoding filter */ +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/avassert.h" #include "avfilter.h" diff --git a/libavfilter/af_speechnorm.c b/libavfilter/af_speechnorm.c index a2b51a1bd8..d044177352 100644 --- a/libavfilter/af_speechnorm.c +++ b/libavfilter/af_speechnorm.c @@ -28,6 +28,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #define FF_BUFQUEUE_SIZE (1024) diff --git a/libavfilter/asrc_afirsrc.c b/libavfilter/asrc_afirsrc.c index 4002118d6a..0ede722ba1 100644 --- a/libavfilter/asrc_afirsrc.c +++ b/libavfilter/asrc_afirsrc.c @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/eval.h" #include "libavutil/opt.h" #include "libavutil/tx.h" diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c index 286334acc8..0aab14b58f 100644 --- a/libavfilter/asrc_anoisesrc.c +++ b/libavfilter/asrc_anoisesrc.c @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" diff --git a/libavfilter/asrc_hilbert.c b/libavfilter/asrc_hilbert.c index 64e566084c..e7d596ee46 100644 --- a/libavfilter/asrc_hilbert.c +++ b/libavfilter/asrc_hilbert.c @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" diff --git a/libavfilter/asrc_sinc.c b/libavfilter/asrc_sinc.c index e4aa51c0d0..5397d89c77 100644 --- a/libavfilter/asrc_sinc.c +++ b/libavfilter/asrc_sinc.c @@ -20,6 +20,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavcodec/avfft.h" diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c index 996a6f63c5..37589dd151 100644 --- a/libavfilter/avf_showcqt.c +++ b/libavfilter/avf_showcqt.c @@ -21,6 +21,7 @@ #include "config.h" #include "libavcodec/avfft.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/xga_font_data.h" #include "libavutil/eval.h" diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 54f6738f9a..92b092fac6 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -33,6 +33,7 @@ #include "libavutil/attributes.h" #include "libavutil/avstring.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" diff --git a/libavfilter/tests/formats.c b/libavfilter/tests/formats.c index ee497f3b90..c1e30e73ee 100644 --- a/libavfilter/tests/formats.c +++ b/libavfilter/tests/formats.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavfilter/formats.c" #undef printf diff --git a/libavformat/alp.c b/libavformat/alp.c index bc19f02083..0d74e73c0b 100644 --- a/libavformat/alp.c +++ b/libavformat/alp.c @@ -19,6 +19,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" #include "rawenc.h" diff --git a/libavformat/apm.c b/libavformat/apm.c index 6ae53b8712..d5499f1d90 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -23,6 +23,7 @@ #include "internal.h" #include "rawenc.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index c3ac49fdc2..23e1437209 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -21,6 +21,7 @@ */ #include "avformat.h" #include "internal.h" +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" #include "libavutil/opt.h" diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index 73db777199..60bc598eb4 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -19,6 +19,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" #include "libavutil/opt.h" diff --git a/libavformat/codec2.c b/libavformat/codec2.c index ce249d4470..271d2dc703 100644 --- a/libavformat/codec2.c +++ b/libavformat/codec2.c @@ -21,6 +21,7 @@ #include #include "libavcodec/codec2utils.h" +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avio_internal.h" #include "avformat.h" diff --git a/libavformat/derf.c b/libavformat/derf.c index a09433ba07..d50a853194 100644 --- a/libavformat/derf.c +++ b/libavformat/derf.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/dsfdec.c b/libavformat/dsfdec.c index 690fd02bb3..02ee4c1231 100644 --- a/libavformat/dsfdec.c +++ b/libavformat/dsfdec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c index 86b1101d6b..0ad1c937a9 100644 --- a/libavformat/eacdata.c +++ b/libavformat/eacdata.c @@ -28,6 +28,7 @@ * http://wiki.multimedia.cx/index.php?title=EA_Command_And_Conquer_3_Audio_Codec */ +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/framehash.c b/libavformat/framehash.c index 8d90793d7c..04c40825b9 100644 --- a/libavformat/framehash.c +++ b/libavformat/framehash.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "internal.h" int ff_framehash_write_header(AVFormatContext *s) diff --git a/libavformat/fwse.c b/libavformat/fwse.c index 970d5ffe89..ed8cd3a6db 100644 --- a/libavformat/fwse.c +++ b/libavformat/fwse.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/genh.c b/libavformat/genh.c index 6d36e5f5fc..f9b222d8cd 100644 --- a/libavformat/genh.c +++ b/libavformat/genh.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavcodec/internal.h" #include "avformat.h" diff --git a/libavformat/ifv.c b/libavformat/ifv.c index f82328ada0..b3b9213aa5 100644 --- a/libavformat/ifv.c +++ b/libavformat/ifv.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" #include "avio_internal.h" diff --git a/libavformat/imx.c b/libavformat/imx.c index e26f3728ff..6d3a5ad8d7 100644 --- a/libavformat/imx.c +++ b/libavformat/imx.c @@ -24,6 +24,7 @@ #include "internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/internal.h" #define IMX_TAG MKTAG('I', 'M', 'A', 'X') diff --git a/libavformat/isom.c b/libavformat/isom.c index 35c5eb982e..4df5440023 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -27,6 +27,7 @@ #include "libavcodec/mpeg4audio.h" #include "libavcodec/mpegaudiodata.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" /* http://www.mp4ra.org */ diff --git a/libavformat/kvag.c b/libavformat/kvag.c index 94dc1ddc04..04e9ec813e 100644 --- a/libavformat/kvag.c +++ b/libavformat/kvag.c @@ -19,6 +19,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" #include "rawenc.h" diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 628b0939dc..ebf1839572 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -31,6 +31,7 @@ #endif #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 04f3e94158..7562b2e24d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -43,6 +43,7 @@ #include "libavcodec/raw.h" #include "internal.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/intfloat.h" #include "libavutil/mathematics.h" #include "libavutil/libm.h" diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 178e71d891..7e88367938 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "avformat.h" #include "avio_internal.h" #include "internal.h" diff --git a/libavformat/pp_bnk.c b/libavformat/pp_bnk.c index 9455a575b7..41c883dafe 100644 --- a/libavformat/pp_bnk.c +++ b/libavformat/pp_bnk.c @@ -23,6 +23,7 @@ #include "internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/internal.h" #define PP_BNK_MAX_READ_SIZE 4096 diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index df04b31893..43c8bf957a 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/dict.h" #include "libavutil/log.h" #include "libavutil/mathematics.h" diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c index dafdc4a1cc..bd72db5f08 100644 --- a/libavformat/sbgdec.c +++ b/libavformat/sbgdec.c @@ -22,6 +22,7 @@ #include #include #include +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavformat/sga.c b/libavformat/sga.c index 3dc62317a1..16e8fe516d 100644 --- a/libavformat/sga.c +++ b/libavformat/sga.c @@ -22,6 +22,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/internal.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/wsddec.c b/libavformat/wsddec.c index 169a96c71f..1ce9cb0b61 100644 --- a/libavformat/wsddec.c +++ b/libavformat/wsddec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/timecode.h" #include "avformat.h" diff --git a/libswresample/options.c b/libswresample/options.c index 00d4f7c1c9..6911709157 100644 --- a/libswresample/options.c +++ b/libswresample/options.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "swresample_internal.h" diff --git a/libswresample/swresample_frame.c b/libswresample/swresample_frame.c index 2853266d6c..d95c1cc537 100644 --- a/libswresample/swresample_frame.c +++ b/libswresample/swresample_frame.c @@ -20,6 +20,7 @@ */ #include "swresample_internal.h" +#include "libavutil/channel_layout.h" #include "libavutil/frame.h" #include "libavutil/opt.h" diff --git a/tests/api/api-flac-test.c b/tests/api/api-flac-test.c index 88b15e8722..b4f52b191f 100644 --- a/tests/api/api-flac-test.c +++ b/tests/api/api-flac-test.c @@ -28,6 +28,7 @@ */ #include "libavcodec/avcodec.h" +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/samplefmt.h" From patchwork Mon Jun 14 22:41:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28272 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3246779iol; Mon, 14 Jun 2021 15:42:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPmvRiuBLvAiADUhmVmKfThedCbEFrBfWFkS/RApxs6pY+7OKvhtjOQ5UWi4KUOk+vii2p X-Received: by 2002:a17:907:9688:: with SMTP id hd8mr16893075ejc.314.1623710528420; Mon, 14 Jun 2021 15:42:08 -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 z3si599012edc.257.2021.06.14.15.42.08; Mon, 14 Jun 2021 15:42:08 -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=apwkMzFh; 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 5F79E689923; Tue, 15 Jun 2021 01:41:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2074.outbound.protection.outlook.com [40.92.51.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 767066807AA for ; Tue, 15 Jun 2021 01:41:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vdvu8lUcctJwvldBcvfXs9TTpYBAq042icwfeVVrcqTqINv3efnhPvJ9RDx33zyq1Pa6Cafs6dwqm0ZcB/ZpqZfJ+M8LkV1Bj8JzKuonpwqJL/QK4fFnXTV327xKJYbyoehwyg2ynk/cSFM0CTNkGg1NGh7NxgM0PywYiUVUNAXgRbD6Gp5ixJEs62/qGVMoLYhB797+abmu8WMl/p5BVMBQVZevvl1nxgiR9CgToUnL67e4VYyoh1EneDUDXRphut/Pe+eDSfwe4exr2yMJMuSqD0yNWPqLS+1KRTq5fT1Sy1RpSRid+UqOKM44TuO26otukoVMv0X8LQp9dHd7Og== 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=2s9UKBk77OF8cVqgKn+953qP7oRWdJ4/9zmGTYrHGo8=; b=U7h1MRZUl7K30+XzJcqud6KRu9SlWTVCxixIhtVHgoeVarx8ZpBk3xKBL7zqIB5cHf4ADavdooSDNLugqmcSyKAMwhVIGboNyRPjR9MtAuLg7b2DWkIQPSPD9CdCNvvJuwChUmSOXf3eJyx2jBmzZLfbV3hOJ6x1g5gr8iZT22bpJYxOQdOXJJPI7K1pAaGv1vHrTUnR9P8mDW/3Iuc+grzEne3JVgkJ43e8lt0/eVAzoJSdAlrAVBk/aQNsUIY+SIWIe5wK3N2KcEKYjqzdvluqDMmMGOefyJwoafUulAVUtWUSEWIfderficCqYQdaTpwSJqp9dsfuSCW6VC34Og== 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=2s9UKBk77OF8cVqgKn+953qP7oRWdJ4/9zmGTYrHGo8=; b=apwkMzFhJzDlV/PQZLBwcw1N0UrrChah0gA5Mw/39KLB4Ung3ZHTsRUPDpAJVz0/wZFZbgTYQLafXd1peRj8A3OG7vSM8BNVWYSfrjnaEtrdlPSD7VrY+GlmDMwTGXNx5tlbA2+FVJH/dvVyfwYVTArEE/wU/FmaNFNJt3TIy03s7n6r2Wf0UW8T6I4qeCiEQ/BKbBSiTjtlcx/dN75Joo+KcA7UKS6YzCEfR9miXM99rWYTZp2M5copUCd6iok+FMKbUVWRq7hDWl9SQBk+6VrcKQmf/uIiy1mhyYTI5QvNhKnwSXnplCeLMTdkcAjP6ncJf5KzLhNUA1rzpXXzvw== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::4a) by DB8EUR06HT233.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::261) 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:41:51 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:41:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DF68FD63A7590848146BB70C5454F6AC5ABDAE552E1FCB4AF98B889C26046E3D; UpperCasedChecksum:5D0DD5525F76A2E7589B88066635DECD2265769A1FF74C61DA05ACC5349F0F20; SizeAsReceived:7582; Count:48 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:41:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:19 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [lDvrEwbnX6AHdCJOrrfe7gFf9y2QJQu9] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:41:50 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 48f619a7-0e9b-4dbc-8b24-08d92f8599ec X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS8u28ets82B/Gq5G20dnAwxQe5VASxabw3LP+/GOt9DM61lJyL+6djg9hmoIAbJ8B6dczCfIT+LLi85FjJvIWi5m2iWDOZzZpcoZR6BQoIgcQ3yfiOA0xpe9rPX+oBf/B0YxFL5jnN0yNhjJDHkYg9jpE7M6tUPR0VTdN+mPhqE7BKNjgau3e/3n9n8W+RSwU1mxxkDYYN6oQGddMr9Hdczg0ZvBv/JA9aNnRfpWWEZgNC/t8Up2DTXRvQK/s2mZ453BzZsEqq3TOXOk2e7WYDXK/DV9tQrjX0UzDS+I9iQlK39JFSC0w+HrPLGJsQrtvZGfl6NuKR9r+HBRIC0ybwDtfDhafOr65S3ILrpnwFjC250ZwN8OtQBDPJLtRJ/Jr4xmAaACLmgePZb+EFjqKjkzbqeL7RriVLdOyUSeAEHGTfgCSqghO+++adgggd96qVR/C/2d6J/dGgQwdU9pu8BKA+W1nzd0qHFqhrLpujZOiCUEQl4ZupdmsEMt84heVljhp/2marM4YQnyXLrSgNX3b0IrFqAQ/plNOAlaJSJ1eTvPF1X79mAv3hklHuWJGOQ69fF9POsmCIikylRIIEhLMtjBOd7yPU8AoqScCru/GEAzpOM1DewZfu3avN+4XebEvbIWjUOFC6S8MvgJewnBHzzVxLkxO9noqjx9jXhOZn4Iy4AJ6hvMy7bx1y4BTmMV0+6XXlQx26CTaXJIgtZr5d5SSPPn1g4V4fKKEVhOYqOpioSiJa9Jnt+8C7+fY= X-MS-TrafficTypeDiagnostic: DB8EUR06HT233: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gPgFF2ye77k8tHkQqOIZmLONhVUDcCJzj4YfTuUsHc95ti708Y9rRSVhXPpcgipd+BesSbmprAKCKnY+490rc3OWfocFUHJYHH3ucMqNxmLV1REHNrh9S6oSG23iQO13yuSH0jY8xXdF4p9fh2leXdhFKrEjXdWr3IxXhGqZH4ZDxzEhGpLdW2dI+3F9Yl3rJ5xgmdlP1zY5q5AKbv1ouKIVkejSC8eVcGtjpS0vzIvMRo3cZBIwJXYcQkEWNdje384kZOVn+WbsuYeTDhV4UXRsZzYP01Wyy/HkXjsXyrBZmz9d2GEAHzLrvG9iHH29A02LX2R34eblhUZCUT3oiRGPBOT/nOyZfwTegH4dVhkLPtY3EXc3cVLI/R1x7mpGaVXdz3fkiJ0KoSJWpeO29g== X-MS-Exchange-AntiSpam-MessageData: C13YSpAZ8kQBNpU+ZtH7Cq5vVU9RFXHKrgq78Wpyw2qpehHvQtlLRsWC87BD59q1ZtpcP7FP8mNkPuxzayrOwCkXmmAP56nnyO3Ih3+rcnohVjLTA9VdwDaKrHUyA/goRsv08+haK1jQVtb7KmilNg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48f619a7-0e9b-4dbc-8b24-08d92f8599ec X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:51.1716 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT233 Subject: [FFmpeg-devel] [PATCH 03/17] avcodec/avcodec: Don't include errno.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: CZz+QN72mk1i This inclusion has been added before libavutil/error.h was split off from avcodec.h (in 60c144f700e2e362047b00704abcb694d49e549c). Signed-off-by: Andreas Rheinhardt --- Still included implicitly (even via multiple paths). libavcodec/avcodec.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 292c373c68..6873e12279 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -27,7 +27,6 @@ * Libavcodec external API header */ -#include #include "libavutil/samplefmt.h" #include "libavutil/attributes.h" #include "libavutil/avutil.h" From patchwork Mon Jun 14 22:41:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28270 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3246870iol; Mon, 14 Jun 2021 15:42:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBYTWJ3L0hYTFIZS/iT4Ml5Z3XCKfvAF2Fj1wxcxh6KYXWeC/aixuzN078MqxkiOoEMyAx X-Received: by 2002:a17:906:8345:: with SMTP id b5mr17129539ejy.14.1623710539120; Mon, 14 Jun 2021 15:42:19 -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 m18si13447079ejl.45.2021.06.14.15.42.18; Mon, 14 Jun 2021 15:42:19 -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=ksFxM1sa; 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 51074689963; Tue, 15 Jun 2021 01:42:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2072.outbound.protection.outlook.com [40.92.17.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AD44687F4E for ; Tue, 15 Jun 2021 01:41:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FNqZHcA70Ilmw8n8jO0Crt7r2mpHvlLRKXp9yCjNGgfxcXyrGYQuRmRZR/PEXOFMRQ9oFtIAXRSpuvzi1KyUXcyvP7Xs3NGD9Z8lMEhTstD3owLKFqk1enmPCxdgxBuZ2nT5Xh4WJrYoTx3+udezrrGctFxdQVgQhPsfBS8mkCWQ+72tJmUJCVv9gih4TwPYroqtP2uj2AWn3klv4nK6xWUXEZ63yh9Kw6LDYB/kyB+xABHK5htyMhZSY3wMaoezBKi1VlBogjGbEzPWWZP7fJtjPVBMMc5bJ5SJggbDKlsuQkKsRaCFo62JS2Wco84u0uPxQ5Ui+EiBcKJ+CkB7Ng== 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=4q7B889Jg3ldG92KCLhCG7jeKdDMWY/zyomqqaCXp40=; b=jxB8O4/4Bhs1TO5rdw8oZc+EtQ5phUR6UElYJ9citOtnYqd46XMUFP+6LKwf9SfNTyKZtAGvMLeQOl7aoxZTrRZ3d6gTWMbp1qD8TlE8Z7RptI41Y6WnRPUSY11LEEF5lnUR693J2iTNCk6Uw5u/TsZndZ2fLtCpzkLTiJ+6LkjHfE/X5MZZEqqAUIYznHL04GxeCp+Kl6Xsi00fRJpCf2uJ+77qStj1zG8I4DuNuy0NW6Q10bSj4VTzLJajUhp2bGaMOxbjAUbA0vLk0dXb89rvYgsx6CheImFbRJqDJtMquA0VL2MzKGuND9bUQPBL8v7iFDV6A3Fd+QpH8lIHXA== 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=4q7B889Jg3ldG92KCLhCG7jeKdDMWY/zyomqqaCXp40=; b=ksFxM1sarlsejRe2G6xSCNeXCaXn5p1ZImPPFhxBHUOn5feyoHAaWcCE0MwFmcesBLEM9EwIgRd77alVv4nr1rokq8Jnj4rlGb1atAdsAVIAaWMpZLjnKDTVhIs095MnzyStgDxBNEqAnLz758qukJx44w939AXnqHp3no+FIr0QP21WSC2M6A49YxNOX56tgYdyecJraE/sYQj4B8pUy+1tXHdKzPg9+wfUvuVatRVAm6+NG72S3v4YslGO6goSuPfBFMHVcZjrDzuQhah+vuZlt5vya+i0+kFyrKiOaUTBsL9o7jPSXeMxCe5pbAgSkPV2TqfXY6OAK3TVge8cog== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::51) by DB8EUR06HT111.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::468) 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:41:55 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:41:55 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D86FA06FD5A153B03EEB1AD8997EABFD7877783468C62DB2FFF3D3D7DDBA142C; UpperCasedChecksum:C3CBFC6DF935B0DD1B332A8BB382E6A1612C1BD0282B0656D5E6A55670B74250; SizeAsReceived:7585; Count:48 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:41:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:20 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [mrt0JCyLXhgow84gQvD2QmLRB6yRpFkF] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:41:55 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 56e4527c-724e-415c-c462-08d92f859c96 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS8u28ets82B/Gq5G20dnAwZoDG+CM0a5MAKokpm8n4MWaA2xzkqc+z0cX+WjYPbXCwK8wmdRC/kDcP0UmEAMFtE4sxi8rIhZ13mVppJo9OQ5iHClyx95T3G6dmtbSPdd16cSdmyjowUALV+y1aLvVncImz8S9Of0roBZ8bRm1KEVF6F4d9sG2TG37Lv3IlZyF0+B/phATtPCenVRvH59aE9WCdoigOeep8ZyKeNueoZVbD3zReKlOWbbZ+Js8x7wKSvolbLl+l7zjZiMh4ZgAtihilDTnImQYeEEtMcPmp87DuWObZeMOIT0YZgU8DvlbbxxG5lBS9B+3Nu9YUmEMd7fUk6iV4xIDWmKP+4hrb+C5WYxPgdXjDB3dpS8ogTQAzljgGtVe7rO8H+ChU4H99SeD3TnACXZakiyL9Xr2VuYyw6fyooS0y4LQyVbbO+uEjsOg7uCGxezPzUrxWf58FHn9fFtemEi04kbQddPvp51Cgt+cxa6jZr1DZCLxao+PUspTytbs4Vz+7T8prtoV0MkypG6l9fFSikdIwcQVBcKyk56+SPaKewXR5TxVYNs3VGyFhC6KWUBi1AHbCMByYj9FUoDHYssWl118mqDVuSAqUchgeYUP1BGbtlmmJZc4ZLa04hMUhSkZNIl7q4s13a4aYjTzENdYkJ4hR96UXWQ+cMf6VAo5THa0Fk+Vu8jRxSh3kOGeVP0JF5J9SPXRbrKQIEwIHiRCC95+/+pRkAiRelhUthuMzlUoAhCoYiWI= X-MS-TrafficTypeDiagnostic: DB8EUR06HT111: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nJJH4H6soWtiG5KAqFzBi1SGpIX5m2ldOokT+29QfTkxtRPoRu18Heslp5yxZLV/LlHSpCVPAitJwTm8+VP5QNHAG1NGNp8KaqlO8XbhvWitWgcwRkcnqxrNbgUVswwrA95HuC+rGo2Df9YyZvcBfmCFI8QdlUxfar/mupbauedXbILpg3Fsj6Qtz6Vym3O1JBdJyjLNNhckTOomTSmNwvOFmjuL//JDL3Re38hv8OcUNMpVbLCDTa2qQmIPloGnH2Pa+Dd7DNpKRQdipTAmh9aGZay7fCFyEgaomC5kcI06ASu10WiLJuA2F3OWr/gl+ng4jJmvi+LO6xVAuTjzhEh2k0lGDkx47v2W7geO/nEktzixlEsz1yU6eraij89b8q362+UNWiyKb+fl7U1+gA== X-MS-Exchange-AntiSpam-MessageData: mWHP2N6kknwTXay5i6+xlNY8FZvVBIx4KYInMgE+8/DOMGGvrfETMdv8ja1B8zbYo8EUVtAUsLQwAOm+kBpIO/GZBfdlYg4yI4UZCmwTYhhtKrfm6MIv62344rs+kou+YzGUzoNJTxj/6lTZrlTdLQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56e4527c-724e-415c-c462-08d92f859c96 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:55.6346 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT111 Subject: [FFmpeg-devel] [PATCH 04/17] avcodec/avcodec: Don't include hwcontext.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: ow4U7HtiSVRp It is no longer used directly; but it is still indirectly included via codec.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6873e12279..5457f47bd0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -34,7 +34,6 @@ #include "libavutil/cpu.h" #include "libavutil/dict.h" #include "libavutil/frame.h" -#include "libavutil/hwcontext.h" #include "libavutil/log.h" #include "libavutil/pixfmt.h" #include "libavutil/rational.h" From patchwork Mon Jun 14 22:41:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28273 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3246937iol; Mon, 14 Jun 2021 15:42:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhxlpm5peg61322+iRWZvKKEpDAsP+G4v0GdrXZWL6pdyYyRAZ9kVRIvKPY1UufcayBSRn X-Received: by 2002:a17:906:998c:: with SMTP id af12mr17606726ejc.510.1623710548497; Mon, 14 Jun 2021 15:42:28 -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 d5si14302379edn.231.2021.06.14.15.42.28; Mon, 14 Jun 2021 15:42:28 -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=f4xeMv15; 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 43098689985; Tue, 15 Jun 2021 01:42:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2042.outbound.protection.outlook.com [40.92.51.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23A2868980E for ; Tue, 15 Jun 2021 01:41:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EgDou/rSmTXBcClsqZCYfGq05musxtKp/n5e9EpfUc6azlFoMVrNbNpGnqd295u8AHPD/L8Fuvqye8GodJsWFApUyXIMbiWJRwDCPmUJ/BL0hGN+1IDvMK5ZRe9MhS+6N75Wbht0gkJlwfY2nCpWpUp4KSpnXaK0YXXabYXBZ0F8KJweiQrf1D7C390YaBUUbVN9aEsqIH9Rw7x34i6ONjtaRu2k+wyBtfJCU+otiEY2RA76GvcRJhAe1tIcxTWCvrrqwZUjMAHS3A51KLFMKd1/sWJc+PxnQ86X+O9zhaYnAgPaqW0S7bd69CqUo0nGSXIB2yJFcu5bCO1CjSkKAA== 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=4gW0YGwKYX0UoYnu2QqJc9IPu1kIN9jdkgXj9dX0Kw4=; b=eX0b2pzCk57EqSWBIAEsNbzH1NxDzA292CVlcbCylKpCyOQtExyoYHm88c1Xb8lbNaRb/3zk/XGSTXr3GGRljrYiFa/wvrA/+B4qO4uEJdjGNCs4d+9tCM3ZEFx4QCPdCyf5lZwHF/nGKhxwVb6WP/Lfri+uCc7tty8k2rvOV8uwpb19o8KNfN6Ump69Gucy3EeZAEfDACIO6rBNocH51x1vJs8TfhkKFQu9ToYVV5bygHnRWvvlQpRO1/KLk6m1CTxaZ6gfINKPFivEMhj103k1Gj5eXGA7kKQZpFBx1gjgHO2uEaUFECHn1FO3WcvmXnRTgBOQnCs5GofLHHcEOQ== 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=4gW0YGwKYX0UoYnu2QqJc9IPu1kIN9jdkgXj9dX0Kw4=; b=f4xeMv15ikAK23z+RzWWaellWlva+pJFp8YEW99GcRgiKL2z1WjhHD2mvUP6tA6vRhHw0Lu5D+56gXPKCAs9b7fakhw66iWKaNTWhONPYqsD6Kbv3zcE1i0zxBns8UJWYC/2RI43VKnCMRwS1Ly88hNNjsnqoP08Dtb0/nGLajXp4NvFM0ceMN7KnOZTO9mgoZeG//qpCC72xsNIJOroETPVxlRxbTnzb1YX/WDSrhVSj8nbFi+NY9Tx+SVtqlfIEy2CetG2kuD0shVuIZuj7LrsRqU0RsVSLNJwK/2lODyzdhnVMlwCfculb+QBOCmBTzqPNunBuTOyRse696M48Q== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::4d) by DB8EUR06HT177.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::183) 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:41:56 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:41:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3E9301F9F0F7E632E055C055908AC275F00BDF4B2021AFFB94D8136225927597; UpperCasedChecksum:5B82720B83F191088313DBD7096485F22DCA339A8730BFAF58347CC4006FC874; SizeAsReceived:7580; Count:48 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:41:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:21 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [gdtx52wMSyxRO5sLedw4z9E4smv70rO5] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:41:56 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2df8c51c-493f-4a9d-1903-08d92f859d45 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS8u28ets82B/Gq5G20dnAwvDLlQaKQuvaXX/WiJPII/4s//QJ/szkr1/TQvmD6mQ4OIOwgeMKuoHRTpkbS7XrADeURjeSlp6rB1TrE0lDBkGbK0LdlUCAl5Rf+eD9XG3aWF8iPT16tD3ahfxzzEBHsIOgi+lWL7gK9D1l+eqfLXbU5DIDWTmuDR5OJdR8vGImEosGw5uq9y2oh2sY5CLf4zSKYtH+5rrtWo5udhAsoozhYP0fbcEGbsP6HHzRuMFFbtCrLbkdvsIEyJ60X/JIYd7x5020rqwPrmTce4hOQkXUwY8E5mQcuIfRob5ilmNPZNT5xqfmIBhdTCg7LfUjotH3oJWIDgGGIHXFyi7UU/LlWg2L3mc7iO3/C9E2gGhO/+5Rpsu1wVIumF94FfRxJBXzAmia5++FD/hWbj4hqcgfWjD/vprll2Fbg2Gdb1E4rQTQIwmP+UqPJY8kewMr8oQ963UhvvMKKvUtfHCYi2j+1Z7AB0jiSJvs62SaJXPEjD8BZY1n5uCmDdZkswmjuM1Y0tNcnUjNQL628kU9883IWj2/FgbRiOhTgY+SbKORhLvwKS2wIOB32HfWWp0ZDLwryWBgjRkpc2nJGjLJLhgglzQ6WEto2XWPPTmiXIUHQ26vdBcXHuGtmNKBV0vZJ9/Ks/uTO9D/xGM4lWMxgIrUDJ3YPk+8J9PY79/sqRlEWekfctaelPmsehJVul8bqJwcTJNq/Dd0/e98nMVPjDGZNTizOW+yuSnNW4eXDDDg= X-MS-TrafficTypeDiagnostic: DB8EUR06HT177: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YiTf6+qkNhOVPcFxUPzEIwojb9EpZTI20TbUoOgypJkNtk2gilhJDLtKAvuIAK7MoHlx5Jb2Nq2OF5QhmWv5UhDy5dpfBpYNA7c/N1utg76Hd1eYTY0cgqeQBYt6geKtarVadaGC1m5pNZo4qo0DzOwREZpLHxvan6CpjrhaI7MIIu2F0W0To8yarJDap+wdVef3W44g7YysAHRFb0gNCDX17STOJ3RpKMq6TlHndhOl507NRFk+jf0/fFObaR9lNDQ1ZlRLYf7KUHcewqfgkotBQihorxHf/hOWkHBHXW2PUdcbBYNHf8WqNpDfq5DSd4YJeICwg4DfW1aW1UrQWIPeaIzEOY0M9puh8TRCc8UsN/WfU6ys6gfziz7sefxePbQ3j1BvEcawlzVovurWdw== X-MS-Exchange-AntiSpam-MessageData: D2+N2Ifkf7puERkEUKv2cSi9wuY3oQqabtkULuVRrI5PdB0ddF/pQvh0aszYy6hU3geg7eWwVnKP6noqI9+hYOS/vUXYpAlCA7XLkRSJ4thSlXzD7ALT+O97xqpd+W6SWj/ZQXppdOhahtgzJX34WA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2df8c51c-493f-4a9d-1903-08d92f859d45 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:56.7881 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT177 Subject: [FFmpeg-devel] [PATCH 05/17] avcodec/avcodec: Don't include cpu.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: hWqrz2slUv3F It is not used here at all; instead, add it where it is used without including it or any of the arch-specific CPU headers. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 1 - libavcodec/frame_thread_encoder.c | 1 + libavcodec/libaomdec.c | 1 + libavcodec/libaomenc.c | 1 + libavcodec/libdav1d.c | 1 + libavcodec/libdavs2.c | 1 + libavcodec/libuavs3d.c | 1 + libavcodec/libvpxdec.c | 1 + libavcodec/libvpxenc.c | 1 + libavcodec/tests/aarch64/dct.c | 1 + libavcodec/tests/arm/dct.c | 1 + libavcodec/tests/motion.c | 1 + libavcodec/tests/ppc/dct.c | 1 + libavcodec/tests/x86/dct.c | 1 + libavfilter/dnn/dnn_backend_openvino.c | 1 + libavutil/frame.c | 1 + libavutil/slicethread.c | 1 + libpostproc/postprocess.c | 1 + libswresample/resample.c | 1 + tools/target_dec_fuzzer.c | 1 + 20 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5457f47bd0..2304f6d6bb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -31,7 +31,6 @@ #include "libavutil/attributes.h" #include "libavutil/avutil.h" #include "libavutil/buffer.h" -#include "libavutil/cpu.h" #include "libavutil/dict.h" #include "libavutil/frame.h" #include "libavutil/log.h" diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index b3e571f4b0..9cabfc495f 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -23,6 +23,7 @@ #include "frame_thread_encoder.h" #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/thread.h" diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 6e7324a832..75ecc08970 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -27,6 +27,7 @@ #include #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index f977fb4889..485a3be48f 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -30,6 +30,7 @@ #include "libavutil/avassert.h" #include "libavutil/base64.h" #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 50e6200f5d..cd67a906e2 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -22,6 +22,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/film_grain_params.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/imgutils.h" diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 28cad9c5f7..a1672d1c95 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/cpu.h" #include "avcodec.h" #include "internal.h" #include "davs2.h" diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c index f7e458b356..1d523c8722 100644 --- a/libavcodec/libuavs3d.c +++ b/libavcodec/libuavs3d.c @@ -24,6 +24,7 @@ #include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index f9b4c9f427..42d1b8ab1c 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -29,6 +29,7 @@ #include #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 94932a48da..70c8465358 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -38,6 +38,7 @@ #include "libavutil/avstring.h" #include "libavutil/base64.h" #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" diff --git a/libavcodec/tests/aarch64/dct.c b/libavcodec/tests/aarch64/dct.c index 032a9638f6..9e477328d5 100644 --- a/libavcodec/tests/aarch64/dct.c +++ b/libavcodec/tests/aarch64/dct.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/cpu.h" #include "libavcodec/aarch64/idct.h" static const struct algo fdct_tab_arch[] = { diff --git a/libavcodec/tests/arm/dct.c b/libavcodec/tests/arm/dct.c index 596d369a99..5f826e84df 100644 --- a/libavcodec/tests/arm/dct.c +++ b/libavcodec/tests/arm/dct.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/cpu.h" #include "libavcodec/arm/idct.h" static const struct algo fdct_tab_arch[] = { diff --git a/libavcodec/tests/motion.c b/libavcodec/tests/motion.c index d89f9408c2..ef6e1ff309 100644 --- a/libavcodec/tests/motion.c +++ b/libavcodec/tests/motion.c @@ -29,6 +29,7 @@ #include "config.h" #include "libavcodec/me_cmp.h" +#include "libavutil/cpu.h" #include "libavutil/internal.h" #include "libavutil/lfg.h" #include "libavutil/mem.h" diff --git a/libavcodec/tests/ppc/dct.c b/libavcodec/tests/ppc/dct.c index d95db525af..e29dbb0aa3 100644 --- a/libavcodec/tests/ppc/dct.c +++ b/libavcodec/tests/ppc/dct.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/cpu.h" #include "libavcodec/ppc/fdct.h" static const struct algo fdct_tab_arch[] = { diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c index f5c238efc7..104a0f8e0c 100644 --- a/libavcodec/tests/x86/dct.c +++ b/libavcodec/tests/x86/dct.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/cpu.h" #include "libavutil/mem_internal.h" #include "libavcodec/x86/fdct.h" diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 709a772a4d..1c7ac0844f 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -27,6 +27,7 @@ #include "dnn_io_proc.h" #include "libavformat/avio.h" #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/opt.h" #include "libavutil/avstring.h" #include "libavutil/detection_bbox.h" diff --git a/libavutil/frame.c b/libavutil/frame.c index 2ec59b44b1..b0ceaf7145 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -20,6 +20,7 @@ #include "avassert.h" #include "buffer.h" #include "common.h" +#include "cpu.h" #include "dict.h" #include "frame.h" #include "imgutils.h" diff --git a/libavutil/slicethread.c b/libavutil/slicethread.c index dfbe551ef2..f928a5cf00 100644 --- a/libavutil/slicethread.c +++ b/libavutil/slicethread.c @@ -17,6 +17,7 @@ */ #include +#include "cpu.h" #include "slicethread.h" #include "mem.h" #include "thread.h" diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 8d44165dee..2ca7a3779d 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -76,6 +76,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #include "config.h" #include "libavutil/avutil.h" #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include #include diff --git a/libswresample/resample.c b/libswresample/resample.c index df49505bf9..f1ec77f54b 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -27,6 +27,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "resample.h" static inline double eval_poly(const double *coeff, int size, double x) { diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 0f4d4f1bed..15107caea8 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -47,6 +47,7 @@ #include "config.h" #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" From patchwork Mon Jun 14 22:41: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: 28277 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247040iol; Mon, 14 Jun 2021 15:42:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfqH2A7v/JS0MZpzaLDHyZ82cwg/Ydz/PhbpekW0hU1pER7MQgzvv+T5OJGZ1kvKHl3rEb X-Received: by 2002:a17:906:5f99:: with SMTP id a25mr17431387eju.45.1623710559188; Mon, 14 Jun 2021 15:42:39 -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 d20si12945680ejy.157.2021.06.14.15.42.38; Mon, 14 Jun 2021 15:42:39 -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=qG4ltAyr; 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 4572C6898E0; Tue, 15 Jun 2021 01:42:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2021.outbound.protection.outlook.com [40.92.16.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9A5B687F4E for ; Tue, 15 Jun 2021 01:41:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gWnXLxs3AR8AIBp4ouhQlBDQzJBiBVI5c4JN5SttoJY/ghfzbkdFNdKQwtLrnVF5pooHgH1hpbphxr/Mhgm13CtxLrob/oAGzYnG9osM/fbOOsaRfKXRuN9Xbmy1sSC51EV/3qpQmQB2+oB4zX2UtrrGyiVVcCUS+91yA7EkMnLR8Z0ZXkpORBYPPEU9CnaxCiLY9IKj3S6ZyusnYhmxZ77FEjvio2xpkNrydUlquFHnocFWbS/id1hyo5vwiPP0Hzbnj1SS0pJEwXDVmvKpieYw+NWvZF7wT/KLHO5XUIfks46qXfGMCQmm/06uUKElofsAap6dVx+SXtc5PH6/bA== 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=D0sna9cHgIsP6FbjsLGLJnlPlu4V1juC1VDp+te3jwE=; b=CDpWWN8OUubnDFE+6JhzDg7r286ZD5e2UMDZT+r1IBjaT1JtMLcjiTnEPCNXnPF9JOm699uOzfAFdDgEkF3fk5/ialgmTErtXH84NevLon27YKxppLT0h3/vfDNdhUIPq9zNq8RyuBzpNkxqUgZVQMZ3/2MlyNRxVnQx23Q9LAv/eV9Ov7TmJug3to6ai7dCC9pAlKzsqwYo1TwBfOPTAANF9ye5YXj1LjyHiP6HWAV09+bi+r9j3PmCNMDyQo59Qojhf8KlfYhKqNGKTKFvPTJ+1fi76RdS3wkm3OG0uBWSl1itEBFKzYhFhRYuQwMvFkSbu9OoX7thV3p/orWBkw== 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=D0sna9cHgIsP6FbjsLGLJnlPlu4V1juC1VDp+te3jwE=; b=qG4ltAyreeKPHk+97BYHCDuEJ0JPenMSYn6dauu2lG5lNgipNS0i0QbXv5DA0uwcgrFCV4weYy82tnTtI41/W5G5+OeEgffBLNFbbdUFBTqcUfhlwimLAlKjNT/WXtSlBrP1fe4CFXRKdw0OQNQjYnLZEiKbWnopy1uc5wWdTTRrZm4JqEZMYNaAuzzkF2BISM7DBp+uqLm1Jbe47Q94GH6VCGmvKfXYtIxVrUioBVVLIZw9CVP0Vob4C1fbuR2PvjvkZeiGPQ1dDprqn6kCKDRk9ve0Rn4H1Nccrf6mIiRqkYAfI1XX/LTqfXgN578IxQRxah+CQ2QbVBEZBEjTyg== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::42) by DB8EUR06HT170.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::63) 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:41:57 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:41:57 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F1766337C3C81759FB1E994BBD7F3116B9432254BD1324A4F1B0137367BE8EB3; UpperCasedChecksum:24081A180AE34C3079FC044DD4FF7812B75467A46A16DB6EE3E976C460FDB579; SizeAsReceived:7595; Count:48 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:41:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:22 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [QpzAqY0ZhPtY/99t+nFOl7bQeFP/uiQu] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:41:57 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dca83d4d-080d-423c-0e9c-08d92f859de9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViQP5DY1gVUR1zMefR9ogQBP4pyq3S5xXGV+L8RTRTPtA0kxMFJm7vq5yjAGROArvlZUZIlF/8lilESh8DsmCa1/EcAPICThtnYrKwyXzfXXqyofmSRw+87nfRjy1tdiN/jqyz1xc9R2dTzqfeYWwhiAa5IxpsBO85aT0uoUu0Al2xpzDIBjS/W9y1v5/7FRdj63+IS6glkRt0ryAVY8u8U0zhcPgoOtmUjTGnsC5oWGdBQQFrsH7ki5UlYNrRFkBxpI7gJ6xkBdPLXuyLvBnSSLA5EaIxjSZ/seJ1Qe9JGali1av8ujU2pbWw1fY38FVVgn6jJuyWCKgcqw9bjQn2k+D5Q1sIGsyaStr047zyNfVzCthXj7vJ87S1Vrg02WJVSZQUNodnoi5W2X6OSnn4e8of8w0ubVhzTiACYKzJtaErVPBqDasOFUxkIn+3/m2/Yz5rAGITDdZM5am6NI/Ytmp8oVWhzLusH0ryTR00U/n/UuZD6sD9us19UWgtQHRexsgQ2e+uSm7yCE4VeXOhVWcwxzjeyN3nXyAZaSvLr0YDdGKboSf3DNavBskrNewsooibhqKav20W7ARVv2PPi6RaXscu3y7/6rRiqU00FS+OxtsO47KW7o7y0qDWjgOGx7hQR2jowhZjqvcT1rleIPx+xCnzeH48dpluyAEXoRc4/E9KT6IKq36QRdjO76IP4A/gkgx5qE7+Nbxek1detmAHFwmeQo0= X-MS-TrafficTypeDiagnostic: DB8EUR06HT170: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w4aXRofQZq37b0Sdw9vW3dr64ddjMvGT8A47KnpDlA6ST/w3485e4LxtqclA41rlOKQCskJ5yqOllZr4PkJG9IO0RvctR7kjbcmyWVmwdZke6MU8R+Guf96LMoDzI2+zFKLWjMGOMuzJdPq2iw6k+jptJJ9oUALQfausRvOlWcm0+CZ4QBdtOWpwK7CemVuQajMXKphcsvcp8RXKOuRP9qMw2VxNsRF8ksta/kUmds/LWOq1hU+PcOa8RBkdzuvJ6xbj/ZstL3fB/phac7mr6+pWlAoEsjOGGmh0Wt5MouOiXjaSs68r6rd/b6cH0lf4qObvKo5aKz1J87G8QK3nxa9fKuVTNY79NTlWNAKhXqn7L7wyKVV5jo5Bs6CtmE6ZK7oTUeYTWGah5yBXYOba5A== X-MS-Exchange-AntiSpam-MessageData: ggNC7VY/JXvD7gBRsEaDfPmAtjISw3/P56AmZ+D5nj8z6PLH1vjO3IbLxRSKyj3ALxRzQTQOyxcqnkrUeaAg9Lha1UC8w9jfaTQfzqXxGJZSdrkncL2U7vWxYx8v2jgjOlqy+9QbHcGEOkvcFo/4FA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dca83d4d-080d-423c-0e9c-08d92f859de9 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:57.8527 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT170 Subject: [FFmpeg-devel] [PATCH 06/17] avcodec/lossless_videodsp: Improve included headers 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: utST3dCssJrL Signed-off-by: Andreas Rheinhardt --- libavcodec/lossless_videodsp.c | 3 ++- libavcodec/lossless_videodsp.h | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/lossless_videodsp.c b/libavcodec/lossless_videodsp.c index cff94c234d..fa0869eef9 100644 --- a/libavcodec/lossless_videodsp.c +++ b/libavcodec/lossless_videodsp.c @@ -17,7 +17,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" + +#include "config.h" #include "lossless_videodsp.h" #include "libavcodec/mathops.h" diff --git a/libavcodec/lossless_videodsp.h b/libavcodec/lossless_videodsp.h index 8077898d1a..da4baa1414 100644 --- a/libavcodec/lossless_videodsp.h +++ b/libavcodec/lossless_videodsp.h @@ -25,9 +25,6 @@ #include #include -#include "avcodec.h" -#include "libavutil/cpu.h" - typedef struct LLVidDSPContext { void (*add_bytes)(uint8_t *dst /* align 32 */, uint8_t *src /* align 32 */, ptrdiff_t w); From patchwork Mon Jun 14 22:41:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28271 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247123iol; Mon, 14 Jun 2021 15:42:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTY3LeS2s1S3Eh82fhWqxG+hoG47OBpuLk7zcgxrvjjvi8hhOPt4axeM8poyN5OkWoNFhL X-Received: by 2002:a17:906:7946:: with SMTP id l6mr6375295ejo.50.1623710569374; Mon, 14 Jun 2021 15:42:49 -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 z7si12025860edx.603.2021.06.14.15.42.49; Mon, 14 Jun 2021 15:42:49 -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=pNLNBfXR; 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 2C635689A12; Tue, 15 Jun 2021 01:42:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2013.outbound.protection.outlook.com [40.92.16.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32D62689965 for ; Tue, 15 Jun 2021 01:42:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FShHdr7Y1rFIRmF7nGyI/GfWqBWcnYYGC9ePR891s95uZgCnTx8yc1R9R5I89oBjRkFJ85aN3HumBmJMuUYGue/PxdVEFRQ1D1DHWhAgQwV/EbFgfIw01kYPRUK3hD/2hh79VVrreac3nsgeFw+pvE7R8zFiheCOo3l6+j+kWhUDKAUGj2dQUifQeGz6nkjIwHqTRWLwnaH9TN2z8yyrOchFkVz5bWyacSNEYLtdWjFxG7FQwhOWU0dNbS5dxk/OjrMhawLrhVEHGgHfETJGkT4Wt5mW6IYWkb87rjguvQ5NRohaSkjanbWe6DecwPMiMkqPbHhWBzl0lq1WdgRMGQ== 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=KUmJge2O+Ea4Yyk7kGJqbG1VwnzI+figf2xR7PmdYlc=; b=cwcHdsnITXOy/J2H1L2vnaP+VgsGb4EhkpI8FRppCsIhmybWiTaX2mYCWTnfxu6MmiVGTqBD6OW/nFIHn0WRPg/ByV6ZUjTRvxeXmNbDRjNezHxgatGKYv5ZPnHKM6rw/TcE4dmNouVKqNNY5MJnKt5mUy7EkF1fwdHUntsQAq6vCTbnc/9dCro1PdMXxP/6n1GEiU7Fkd49C7uNOqiHxm2TUODqT4GNe+9j5BNioCTuYiLcaH1fFn9/pZ8pYL1pVW05B6fMU520+EydXU1FYzTpPvcoAjXAbfr0BovJIpeRKakWm5vwGHXKjM5/Qq+EO9fODUg2wb50YrQsYhJ3iw== 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=KUmJge2O+Ea4Yyk7kGJqbG1VwnzI+figf2xR7PmdYlc=; b=pNLNBfXRy2jKhMqE2R56b5lVJd/AsSMq67g17zfNLA9Ete223MYNOKCjl3Z73FTJlJ1E8hKf68UY/j6+kzRzZ4ctLAVv76qNg6R1hfIYd4PqidHAUyrKxU1ZraJ9LJ07Yeyv/7dziB2AhA35AEVBKN8qqtyo8J4NHInHT3DNfGmWqrIJZdONIk9IQTPCIkpqMcBxSIXKMQqFm6OYkZifwYcjLHIZ3WQOcGk42JQ+VSeU1meCblh9DUv2M3ezOrCQi3WdLsKbHXJDOHKUCdn7gGjawnuZocval83GDItR8UsA3KeP7CXI+JiTE0fq734yDX7aVi4F2BvWObEstAqZvQ== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::50) by DB8EUR06HT127.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::66) 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:41:59 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:41:59 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6334FCFEDF5E5C2F080E2F9469FE07F645ED0BB16398FE3A0458EA25726AA931; UpperCasedChecksum:B43FD67010336958A1A3A57083965D7FAAF1F795F729616087EBE36271913C0C; SizeAsReceived:7608; Count:48 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:41:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:23 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Rd/KVGiEzeSBEz23iBeD0koe0Zrek+8X] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:41:58 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 93850ede-7926-4363-c361-08d92f859e86 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS8u28ets82B/Gq5G20dnAw84Y11wOOZpl27D+GRu8TgcYOeyoYRPmTTXgJkVJpyRJy0BjtwXJJheVXLj8jKpfSsmpETsrTmtgVAmRwFbIeUKkOh4rDkFCb7K1O8PmEMQlles4rvGgs+92aIDUTzIU/oo0nRNw7VqXOCBKx1pynWBEfE215yvwE8/0r+s1qfyEWjZVPBN9eYrLoEsVpT8j9yl24D6cpXB27GI9TmtoAF259M4GRl9H3/Nd6bLjTWnuv0H6jsLopIu1gwSt4f0wuvjF4BDay3jP35+YRefyV2+2BbWWPz1r5gQNZnzumLPGr9mkYl0KVVdPIGr6kGfUNGJC7yxtli5pul+cFFIia3zxdgCc0iNjEAR/mAHeMCM61Qt/MCjXDsZb1pW+XWfYXQbJmWjoGwPgpW4T+59TxOiG0qpthLa+Gg28LNeDyrzGdqxJAhxE6xhIuqBzAGG7h/csQy8kaZuUSU+an4jx9N+eKc8mI0Svi2neCTcozsSIq17+B95SCQEb0MNejBmH/JU6LP24/oNPpkvmEZoJ7y+QsejTAVFVwanzdeK28bA/6vNIlushk047vmqoX9qlWROA/mFD8pIa3S0GBJ8wbk38pgh2PaGhjDlfAbcCtSx8CXwA4bhorUOGrKL0h+f9dSx7Rp5siKGxIJ0pR60VjEmL1U4v4ftbUFL3CeDQkkvfp9wV+lZjQmqt39QwoYZ6fNoCohh7O5LANJDThOFE2LTFc8r4u/kliJS78TM6wleE= X-MS-TrafficTypeDiagnostic: DB8EUR06HT127: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vcw67/2y4ImaGKUqMaRHxjefHQNY6wx/LTqkk8J5naO2TRzykgwisEeKhu9kn8p/Tduw/Fk5gWnRX1giFDKY5TUooCwMpWmwb9YyeZN9/MLVssuWlH+f76AyIK57ZEZhFK6lpukSMshReR2ImZiMbZ22sRxMwcBGVGwz7DpGrmmt2dR6yYObpdxMwfalA7NmOFPLb1H7Nv0C3BUJM8IQZVyxgWSZ3KapuEqz56WmFFOpHT2n7gjwYdfXatw0e5Sc7Z0lL63c83skCdVeJFfDLMCQf9wJXEIRJ9F6x6EAP3Bb7wtsr6dYUVT3Yg8+f1txc+EYGV0zYrEyNfrSeTRDB790s1m+HXjw271lYOQ+kiVfQffzB3tZOMpZbH8aYvUnCmRjtdyRt8SvK0gZD4rUGQ== X-MS-Exchange-AntiSpam-MessageData: t54JrMR+AxKo4laXgTDKehvarqP11sm+pUgycruRTfwOOhsYeqNnbkHEbzJRIoSN5VrkF6rbFFQwZwkXxufQSO1exWfMoEkRjCXm4afYWhed6tbHpP96ItBPLkh7ubGBvhmS4XIJz+1jW45V31LeJA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93850ede-7926-4363-c361-08d92f859e86 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:58.8872 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT127 Subject: [FFmpeg-devel] [PATCH 07/17] avutil/internal, swresample/audioconvert: Remove cpu.h inclusions 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: D3+vdjuteZbc These inclusions are not necessary, as cpu.h is already included wherever it is needed (via direct inclusion or via the arch-specific headers). Signed-off-by: Andreas Rheinhardt --- I did my best to make sure this is correct on all arches; but testing is always welcome. libavutil/internal.h | 1 - libswresample/audioconvert.h | 1 - 2 files changed, 2 deletions(-) diff --git a/libavutil/internal.h b/libavutil/internal.h index 7cd36ff742..a33e8700c3 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -40,7 +40,6 @@ #include "config.h" #include "attributes.h" #include "timer.h" -#include "cpu.h" #include "dict.h" #include "macros.h" #include "pixfmt.h" diff --git a/libswresample/audioconvert.h b/libswresample/audioconvert.h index 1ca30c2a65..bb143a876d 100644 --- a/libswresample/audioconvert.h +++ b/libswresample/audioconvert.h @@ -30,7 +30,6 @@ #include "swresample_internal.h" -#include "libavutil/cpu.h" typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end); From patchwork Mon Jun 14 22:41:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28291 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp3249644ybk; Mon, 14 Jun 2021 15:42:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLp/T7zIXmrd9jSy6LyjDkcnfpdnTS7GwTUnvw14sZ7f9cfV47ooSQWr7YoLshBk7GbxwT X-Received: by 2002:a17:906:748b:: with SMTP id e11mr643649ejl.297.1623710579662; Mon, 14 Jun 2021 15:42:59 -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 s25si12358009ejm.583.2021.06.14.15.42.59; Mon, 14 Jun 2021 15:42:59 -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=pL4MZnmK; 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 9C393689B0B; Tue, 15 Jun 2021 01:42:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2064.outbound.protection.outlook.com [40.92.16.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C2276899DA for ; Tue, 15 Jun 2021 01:42:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ODqkhiwkwa/jlBPs6TxwpCsrxB6mFXJZUGCf+QZfXrIa2Zd6CrvvkJ/0T8AGTaCK5BLVCA+pLKVGWI6AjIGvz7SoY/UyGKa6FbUbaAKnrHtkQYATEfFcGEkNPdi06n47lc12JZwcwNAB6q2RoJ6M9Xdsc+T4RGxWfuk5YCOT9vC9mCFQbIF/Sq/uWsqsaPi03IsySGwBlG5XU+eU8l88AYOEfsN47OgbGBUyoJpHHV9BBmBmF2cUCNMfEMHM7bJ3AmVUlVZbqFdylZwW8tnXpp87itDjnRcd+SKhYt9+MfjGqWjUfIViJ2EngGSCMkgHZJ8V6Zm2SdqK6I0fwfWgjg== 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=jJt8QtNjpVuzDM8cACYNjbp8gCp8ltQDbCHrL7p1WdE=; b=FVbBSjxPqWgOnmCVVfBgqDQNgXNuUrxsjUi9tc1EVhGNuvbESpAoXga9bRZxZ6JAEutc6EE3NrzPTsYe50qWzi+84cgAfF0yZt6dsab970DvFWQBQH22uG7BGga8GrobCeHf0qBZMbqbLu1DY0mGSMyXO1mDBL/dWcw8O60AIbPPP5/un7Q2nbodbTFRG1iOYqsWAvDz4V+Hr9XfLTKCxq25wIm0DECEA3RUS1L6b1HN2FCve1It402wAwNCyswWt0KaPEkaJKSdJGy0CVu/Wm1wliNi6Wg0kZUnLRS79LhvFWqyDlQJRl/ghCVFG/zgX2FMxZmK4AGaYBW4YmlEkg== 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=jJt8QtNjpVuzDM8cACYNjbp8gCp8ltQDbCHrL7p1WdE=; b=pL4MZnmKeVJC6+kDk7ClB64OsJyfHsTBUzFEcIH96JDGMa69VqNQhgGwOsX9af1PYo9i0IqGjowljqy1E3ufsESbqBRQnacKfjSNk3Lfb7oLQxipX6CPdXiTWUgtAdesUIXYR0oQ7oHMFJPDqAC59rJccPQQWJDBW6BRXZbOdcE20behp2sQ7tkLn7qwiT7QpwDsIGuTt1hwxqr9LIpvxrSay4H5+xSggjWgwe4uaT1UTpNy7S5M5hJ9J1laIe3nInJqDiAPAC+0n6JPYHRM96Ip9e3DaG/XjAPIof5ucdYk48xj/8h74EORnKJMURmuZ3jjDQfsnSIiqhG4ygjOYA== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::4f) by DB8EUR06HT058.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::460) 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:42:00 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:00 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:635FEB32EA0BA6827C5EDEF3F604B2BB204F0C2C23A557ACE9839A17AD96C547; UpperCasedChecksum:ACA298B19E0B71B32F0872EE140FCF6E5A476E85EFAF1BCA19C255D108CEE41C; SizeAsReceived:7581; Count:48 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:42:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:24 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [1m8Zmjb0VSuC5+UfIiRRy9W+eKiS160t] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:41:59 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: bd71d1e8-4120-4d97-c89b-08d92f859f58 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViQP5DY1gVUR1zMefR9ogQPqGGO0FO19FfWqXfdFn9r1yAnvYkppJLTX84fGEwDqSo6V7QjKqzRMO2GXVt5Tn2paWvTjr0bL7+TxlZD8MXIiZl1JJ9uZRnOLoCjiHbKpyKJuUlvkE+pxtpKZY7IVXGZdfI5PlhDH4VScmgPN+5aU5TxJBP14gAj4gVNR2tOkG5aPnw/Ux24hOT4nkhgXXEjVKSRxO3J1vrYp29BiGTdDsn2NRDDDUGxIbOx/BczJkutFlOE2Dsht9Vt/j8XgscrlzBZziyMUR8VFDhOzq0l+DmzO9IDzbnKeuZWBvMI1VWBJQqD4cn/AwM90LGxbRDK28HaSbaMS20+Ap3B2U95v1yGr1ynMf5ZBMJleoIMCtHIcIWRBuYgj6psc2hDDgll4F5mFTwqadsCU9zG/oxhJrQfO8vmmwDVQMnZ59z7RqoEmxgZz8SR0MFKjfq+7foQ/YwoMQtwVpB9k3ovGb5EN6NnpbKkSV4zg2uAEsRsgyvEPO6rcm7fiaPiL3YuTyoJPYZJIX41ik9cGcRxUcmxajdbPSkESE/BrNqm+/Xzi/jIBhmm1TzV1Zfx44+WP2HAncq2s5VdOAVYfcViqJZJfWYK+MbLP1jQFlOLZ5dCxFeItQDQElMvPqP3DkPGPX4pxV3LakjN9XCowZbCBZCJasrxh/bWw3wHraqyQcQ2imzHW4WhbCDsSY7mXH2n71qaMi56L+PjS8= X-MS-TrafficTypeDiagnostic: DB8EUR06HT058: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aOQIhqnbcq4mGVNmTatRJEKeXCpRfZTHXefaOjglgQj37Gn6jEm8zbqcrPiHNNRu8HXZuQMKchTve4KYoLmzs8MFlwj/gFQ7OXbEFGtXNHcNpMnAdJyqWZCEct0Rdk8DRc9sIc9C3miw/eWm0VDmvoxfiNUdrdXWpfo81OtGYThNNLKz51ZSrD6LYPm1RaGoTiqkyitPPDLwpJMOdNSo4PTzIOacT3UglkaRfgt1VDTNRglI3mX9l4xTgTz+5dmkTxeP9e5FwU4fQi/+qlwNX3k1RJcZahtrBM3xYvV+6xoVzqmwUohZm2S6sK8WY2f5E2uD2Q9NJKYQAefoC7Pe7oGhpA74J7utxHWeB5OyOQWKyHtaWBgWUK9RyADwEpJfkzCbZRAUnDD6K3rU4z0jAw/JJKbjCrpIVYq7hT1YCop7Bzp1SN4d+KyHWW6aVF8vkMKBITDLS5VOp1B44jkvQg== X-MS-Exchange-AntiSpam-MessageData: 5l1XMUVT76GFI9MzzoCGrCyY0PtPGL/PfKw1f3tN+tJ5IsQJ2Fbn61Bohek9L5hmfx0qWCnvrO0uog3bjSh8PLiy1zXtMcGq5WG5EolJrL03+cATOuVAArndvkHt3xkBWhBzDqQq889jorSCyHS6Wg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd71d1e8-4120-4d97-c89b-08d92f859f58 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:00.2406 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT058 Subject: [FFmpeg-devel] [PATCH 08/17] Remove obsolete version.h inclusions 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: HHh2n3RnDOGM Content-Length: 10190 These have mostly been added because of FF_API_*; yet when these were removed, removing the header has been forgotten. Signed-off-by: Andreas Rheinhardt --- Some of these leftovers are from the last bump. Sorry. libavcodec/blockdsp.c | 1 - libavcodec/blockdsp.h | 1 - libavcodec/codec_desc.c | 1 - libavcodec/error_resilience.c | 1 - libavcodec/mpegutils.h | 1 - libavcodec/utils.c | 1 - libavfilter/formats.h | 1 - libavformat/hlsproto.c | 1 - libavutil/aes.h | 1 - libavutil/aes_ctr.h | 1 - libavutil/buffer.h | 2 -- libavutil/crc.h | 1 - libavutil/dict.h | 2 -- libavutil/hash.h | 2 -- libavutil/hmac.c | 1 - libavutil/hmac.h | 1 - libavutil/lls.c | 1 - libavutil/lls.h | 1 - libavutil/log.h | 1 - libavutil/mathematics.c | 1 - libavutil/md5.h | 1 - libavutil/murmur3.h | 2 -- libavutil/opt.h | 1 - libavutil/pixdesc.c | 1 - libavutil/pixdesc.h | 1 - libavutil/ripemd.h | 1 - libavutil/sha.h | 1 - libavutil/sha512.h | 1 - libavutil/tree.h | 1 - 29 files changed, 33 deletions(-) diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c index c7efe7e77b..5fb242ea65 100644 --- a/libavcodec/blockdsp.c +++ b/libavcodec/blockdsp.c @@ -23,7 +23,6 @@ #include "libavutil/attributes.h" #include "avcodec.h" #include "blockdsp.h" -#include "version.h" static void clear_block_c(int16_t *block) { diff --git a/libavcodec/blockdsp.h b/libavcodec/blockdsp.h index 26fc2ea13b..58eecffb07 100644 --- a/libavcodec/blockdsp.h +++ b/libavcodec/blockdsp.h @@ -23,7 +23,6 @@ #include #include "avcodec.h" -#include "version.h" /* add and put pixel (decoding) * Block sizes for op_pixels_func are 8x4,8x8 16x8 16x16. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 35527dcc37..674f4bf8c3 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -27,7 +27,6 @@ #include "codec_id.h" #include "codec_desc.h" #include "profiles.h" -#include "version.h" #define MT(...) (const char *const[]){ __VA_ARGS__, NULL } diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 68bc10ac31..f13be7b918 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -35,7 +35,6 @@ #include "mpegvideo.h" #include "rectangle.h" #include "thread.h" -#include "version.h" /** * @param stride the number of MVs to get to the next row diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 81f0b73bb1..5aeff47bbd 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -26,7 +26,6 @@ #include "libavutil/frame.h" #include "avcodec.h" -#include "version.h" /** * Return value for header parsers if frame is not coded. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0b12ae2930..de2d38c58b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -41,7 +41,6 @@ #include "internal.h" #include "put_bits.h" #include "raw.h" -#include "version.h" #include #include #include diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 3a6044971b..65acc939e3 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -20,7 +20,6 @@ #define AVFILTER_FORMATS_H #include "avfilter.h" -#include "version.h" /** * A list of supported formats for one end of a filter link. This is used diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index 9e78f931e8..6a2765bbe9 100644 --- a/libavformat/hlsproto.c +++ b/libavformat/hlsproto.c @@ -31,7 +31,6 @@ #include "avio_internal.h" #include "internal.h" #include "url.h" -#include "version.h" /* * An apple http stream consists of a playlist with media segment files, diff --git a/libavutil/aes.h b/libavutil/aes.h index 09efbda107..d243286c86 100644 --- a/libavutil/aes.h +++ b/libavutil/aes.h @@ -24,7 +24,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_aes AES diff --git a/libavutil/aes_ctr.h b/libavutil/aes_ctr.h index e4aae126a7..4e9fda7aca 100644 --- a/libavutil/aes_ctr.h +++ b/libavutil/aes_ctr.h @@ -25,7 +25,6 @@ #include #include "attributes.h" -#include "version.h" #define AES_CTR_KEY_SIZE (16) #define AES_CTR_IV_SIZE (8) diff --git a/libavutil/buffer.h b/libavutil/buffer.h index 63ab87eb72..2c0ce1a108 100644 --- a/libavutil/buffer.h +++ b/libavutil/buffer.h @@ -28,8 +28,6 @@ #include #include -#include "version.h" - /** * @defgroup lavu_buffer AVBuffer * @ingroup lavu_data diff --git a/libavutil/crc.h b/libavutil/crc.h index 47e22b4c78..24a2e3caed 100644 --- a/libavutil/crc.h +++ b/libavutil/crc.h @@ -30,7 +30,6 @@ #include #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_crc32 CRC diff --git a/libavutil/dict.h b/libavutil/dict.h index 118f1f00ed..0d1afc6c64 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -32,8 +32,6 @@ #include -#include "version.h" - /** * @addtogroup lavu_dict AVDictionary * @ingroup lavu_data diff --git a/libavutil/hash.h b/libavutil/hash.h index 930d2d6cde..94151ded7c 100644 --- a/libavutil/hash.h +++ b/libavutil/hash.h @@ -30,8 +30,6 @@ #include #include -#include "version.h" - /** * @defgroup lavu_hash Hash Functions * @ingroup lavu_crypto diff --git a/libavutil/hmac.c b/libavutil/hmac.c index e277fd7701..7d241fc73e 100644 --- a/libavutil/hmac.c +++ b/libavutil/hmac.c @@ -28,7 +28,6 @@ #include "sha.h" #include "sha512.h" #include "mem.h" -#include "version.h" #define MAX_HASHLEN 64 #define MAX_BLOCKLEN 128 diff --git a/libavutil/hmac.h b/libavutil/hmac.h index 412e950719..ca4da6a689 100644 --- a/libavutil/hmac.h +++ b/libavutil/hmac.h @@ -23,7 +23,6 @@ #include -#include "version.h" /** * @defgroup lavu_hmac HMAC * @ingroup lavu_crypto diff --git a/libavutil/lls.c b/libavutil/lls.c index 0560b6a79c..3a136baa2d 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -30,7 +30,6 @@ #include "attributes.h" #include "internal.h" -#include "version.h" #include "lls.h" static void update_lls(LLSModel *m, const double *var) diff --git a/libavutil/lls.h b/libavutil/lls.h index 5f849206f7..0709275822 100644 --- a/libavutil/lls.h +++ b/libavutil/lls.h @@ -25,7 +25,6 @@ #include "macros.h" #include "mem_internal.h" -#include "version.h" #define MAX_VARS 32 #define MAX_VARS_ALIGN FFALIGN(MAX_VARS+1,4) diff --git a/libavutil/log.h b/libavutil/log.h index c2f1232a16..8727c38afc 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -24,7 +24,6 @@ #include #include "avutil.h" #include "attributes.h" -#include "version.h" typedef enum { AV_CLASS_CATEGORY_NA = 0, diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c index 2de2b39da0..f4e541fa24 100644 --- a/libavutil/mathematics.c +++ b/libavutil/mathematics.c @@ -30,7 +30,6 @@ #include "libavutil/intmath.h" #include "libavutil/common.h" #include "avassert.h" -#include "version.h" /* Stein's binary GCD algorithm: * https://en.wikipedia.org/wiki/Binary_GCD_algorithm */ diff --git a/libavutil/md5.h b/libavutil/md5.h index eee6af44df..fc2eabdb16 100644 --- a/libavutil/md5.h +++ b/libavutil/md5.h @@ -31,7 +31,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_md5 MD5 diff --git a/libavutil/murmur3.h b/libavutil/murmur3.h index c5cd7e49e0..d90bc2fcd1 100644 --- a/libavutil/murmur3.h +++ b/libavutil/murmur3.h @@ -30,8 +30,6 @@ #include #include -#include "version.h" - /** * @defgroup lavu_murmur3 Murmur3 * @ingroup lavu_hash diff --git a/libavutil/opt.h b/libavutil/opt.h index c2329e5589..9e1e8ede06 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -33,7 +33,6 @@ #include "log.h" #include "pixfmt.h" #include "samplefmt.h" -#include "version.h" /** * @defgroup avoptions AVOptions diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 751843e991..2346138d04 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -29,7 +29,6 @@ #include "pixdesc.h" #include "internal.h" #include "intreadwrite.h" -#include "version.h" void av_read_image_line2(void *dst, const uint8_t *data[4], const int linesize[4], diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 9e7cfad983..f8a195ffcd 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -26,7 +26,6 @@ #include "attributes.h" #include "pixfmt.h" -#include "version.h" typedef struct AVComponentDescriptor { /** diff --git a/libavutil/ripemd.h b/libavutil/ripemd.h index 8c24b72855..9df9f905f3 100644 --- a/libavutil/ripemd.h +++ b/libavutil/ripemd.h @@ -32,7 +32,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_ripemd RIPEMD diff --git a/libavutil/sha.h b/libavutil/sha.h index 85356218b9..2e1220abd1 100644 --- a/libavutil/sha.h +++ b/libavutil/sha.h @@ -31,7 +31,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_sha SHA diff --git a/libavutil/sha512.h b/libavutil/sha512.h index 30dd8744f8..a4a3f23db3 100644 --- a/libavutil/sha512.h +++ b/libavutil/sha512.h @@ -32,7 +32,6 @@ #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_sha512 SHA-512 diff --git a/libavutil/tree.h b/libavutil/tree.h index d5e0aebfbd..bbb8fbb126 100644 --- a/libavutil/tree.h +++ b/libavutil/tree.h @@ -28,7 +28,6 @@ #define AVUTIL_TREE_H #include "attributes.h" -#include "version.h" /** * @addtogroup lavu_tree AVTree From patchwork Mon Jun 14 22:41:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28275 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247303iol; Mon, 14 Jun 2021 15:43:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4oqQ8gzQjQUAK9GdG7Q9LWQ9hcCNddQq64RZySSCDFdOGRB/qFZFa5HITck5Tg20+7LqI X-Received: by 2002:a17:906:1790:: with SMTP id t16mr17285105eje.203.1623710589510; Mon, 14 Jun 2021 15:43:09 -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 c8si12019324edr.306.2021.06.14.15.43.09; Mon, 14 Jun 2021 15:43:09 -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=U5U0t0uO; 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 3924B689ADE; Tue, 15 Jun 2021 01:42:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2019.outbound.protection.outlook.com [40.92.51.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB55C689A12 for ; Tue, 15 Jun 2021 01:42:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U/T1RCqTPBlr7F9MwkXX8gSQKJqrhG59+st9AijeAzyZVCjXb2tu3yWl3iaNU+TDI6kChoRevYSL2AxostYNMYOUqHlQle5qN+qrtvvjRSJozsNRtXSGta5vtxocrZ9AVRxXw4chFuuQBB5D10yRLFuWGcpY9Lr6y5JkGyxCIklcStOEMker1hjEvixwjkBNvWClxtDD7S/89KmHiyp1A9eKZgmA23jnm4TLhRw9ii6n80l/AhsUcdOzXov/Hj3n1/QP7xjOQVJWr5WX/Vh0oK6ULV06nXaevGpOJblZVNx2r+nSk8glTWLuXPXKdrzanzRt863iW9VOmO3bbkd+zg== 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=KTRTsoa9vNhqEjPbK+WjIFcugWm3JL2zFVQCGkoH8Ts=; b=KxZfQylgRurWQ6KwxcVdccNWXDtdt1KWWDoITuE81315XJZtaSQfmNlVMMYbiBp9kAMP69fQBHalagccWnsCGzgsEAuqasYIKjD1ocU2R0kqauhLFsAIQdWfk6mfV7lt98UVOH2sJhz6+W6uSN2VVo/V+9eHhkaTMBDmr9HZTZHsSCRe/aedH57dsphpkEuS7NpG58B6YGOtpiaW+VYrI53j+sx9l4sYLZQL8PX8DVBV900C751ynmgQ2t4ehrPBj7zDk2Ix1nGi/sRC79vtgHh7NsdKGml/Ay/7fyZz2K+Egxp6QspS3nwCXuz1d8i36FXv98os6WNelsXXkC+M/g== 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=KTRTsoa9vNhqEjPbK+WjIFcugWm3JL2zFVQCGkoH8Ts=; b=U5U0t0uOWqbPoctyzfnjctIGJSztyPwnjbqRzY5rCPYJFVBr+3eCM0Pu8/d7mD5kmj85RC28sVGunDKA3GJRvXnAx11PpM6tYEpF1kok4GTH67Tli52OHZ+lJ7DP27ufO18/WE5wnGeW9NspTcKilj2bdMoZTITQJUQskoqr+U09gqIe64kyzCeSaHpjz19W43zaUl16VNxdSc/jZbtbsUzkA1tXwa5KpHS1/7q97wdG8qnr2ScL/igqUqyYUBTPNKEnK8m65emiPqjSbLuJ8fmZ9spQJf3D3VzkRx6Toz30GbeDw5L0mzwnYVauksY6vRB66nXIGFcRn/X6woRw8g== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::48) by DB8EUR06HT126.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::103) 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:42:01 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:01 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FAE1D1266564698B234D828B0EB507962CB5D3F6AD4EB1671033D0E8EBA952AB; UpperCasedChecksum:F69E1144D745F6E008EF6DC99CEFB33044BCD7B445265D7E5DF090786775364C; SizeAsReceived:7577; Count:48 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:42:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:25 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [/YUTM5d1jvhLglCw5hy26vCVERECQS4A] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:00 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: bf7dcc56-9a6e-45cc-198d-08d92f859ff7 X-MS-TrafficTypeDiagnostic: DB8EUR06HT126: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z5QF1ro1lGGe1aWmYIq/lOF/Gmoyjn9F1zbFf+2kGLx7joPZM+9bsOZqroTOlhu94iD7i1V6Z3SOS945h4k+/Diem0NsfVgWLRpQkN+wEVryx9inlLTE7MDvCHmeU2Tig9xRKhvV9YoKED/Y7dZJfGHFgPKbaapdmUuqfF8RVd5b8dhDh730nvjmus6ZURFfScaskXkWZIAvI0tvHsUkPpXaDOOqOM9nemFyAJKWUWDN3hkS8Dp0MBQkhObKh1E7CzJMi/W+gZWf98S/cF2bETkkkxILS8XAJrP+OZ6FFP8T2AdCzCuqbOvSH7MHiBb9NycXSdYMEg6xQfFsOhp+Kc4aSlbY4x4h/cIsMXXIfdI45bGqXuO0Vin0UOvJumLRuQe4buJFijSXb+Ok7gyg0g== X-MS-Exchange-AntiSpam-MessageData: PCxozQKl/tDSyTfd6pxJfBEZi7B+rjr9JvtkcabDyRU9eiEW+s0t8E0SihOq0X09+Qqk/gKUYPUI+TqSJt/vUBrQBQkyk4kzKLliCGPUtqMdizYiKfNIG9RO4Qooakc9aWqxAshRv0UaOiuvYQMMFw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf7dcc56-9a6e-45cc-198d-08d92f859ff7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:01.3091 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT126 Subject: [FFmpeg-devel] [PATCH 09/17] Remove unnecessary mem.h inclusions 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: qDuCk6UlFTsM From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_qsv.c | 1 - libavcodec/aactab.c | 1 - libavcodec/arbc.c | 1 - libavcodec/argo.c | 1 - libavcodec/dcadsp.c | 1 - libavcodec/dss_sp.c | 1 - libavcodec/dvbsub_parser.c | 1 - libavcodec/h264_redundant_pps_bsf.c | 1 - libavcodec/libvo-amrwbenc.c | 1 - libavcodec/mpegaudiodsp_template.c | 1 - libavcodec/opustab.h | 2 -- libavcodec/rl.c | 1 - libavcodec/snappy.c | 2 -- libavcodec/truemotion2rt.c | 1 - libavcodec/v210dec.c | 1 - libavcodec/v210x.c | 1 - libavcodec/x86/ac3dsp_init.c | 1 - libavcodec/x86/lpc.c | 2 +- libavcodec/x86/rv40dsp_init.c | 1 - libavcodec/x86/vc1dsp_mmx.c | 1 - libavcodec/x86/videodsp_init.c | 1 - libavcodec/x86/vp8dsp_init.c | 1 - libavcodec/x86/vp9dsp_init.c | 1 - libavcodec/x86/vp9dsp_init_16bpp_template.c | 1 - libavdevice/fbdev_dec.c | 1 - libavdevice/fbdev_enc.c | 1 - libavdevice/libcdio.c | 1 - libavfilter/boxblur.h | 1 - libavfilter/drawutils.c | 1 - libavfilter/vf_deinterlace_vaapi.c | 1 - libavfilter/vf_misc_vaapi.c | 1 - libavfilter/vf_neighbor_opencl.c | 1 - libavfilter/vf_overlay_cuda.c | 1 - libavfilter/vf_overlay_opencl.c | 1 - libavfilter/vf_procamp_vaapi.c | 1 - libavfilter/vf_scale_vaapi.c | 1 - libavfilter/vf_tonemap_opencl.c | 1 - libavfilter/vf_tonemap_vaapi.c | 1 - libavfilter/vf_transpose_opencl.c | 1 - libavfilter/vf_transpose_vaapi.c | 1 - libavfilter/vf_xfade_opencl.c | 1 - libavfilter/video.c | 1 - libavfilter/x86/vf_atadenoise_init.c | 1 - libavfilter/x86/vf_bwdif_init.c | 1 - libavfilter/x86/vf_eq_init.c | 1 - libavfilter/x86/vf_gradfun_init.c | 1 - libavfilter/x86/vf_idet_init.c | 1 - libavfilter/x86/vf_maskedclamp_init.c | 1 - libavfilter/x86/vf_transpose_init.c | 1 - libavfilter/x86/vf_w3fdif_init.c | 1 - libavfilter/x86/vf_yadif_init.c | 1 - libavformat/replaygain.c | 1 - libavutil/avsscanf.c | 1 - libavutil/tests/aes_ctr.c | 1 - tests/checkasm/llviddspenc.c | 1 - tests/checkasm/sw_rgb.c | 1 - tests/checkasm/sw_scale.c | 1 - tools/ffhash.c | 2 +- 58 files changed, 2 insertions(+), 60 deletions(-) diff --git a/fftools/ffmpeg_qsv.c b/fftools/ffmpeg_qsv.c index 960c88b69d..7bd999d310 100644 --- a/fftools/ffmpeg_qsv.c +++ b/fftools/ffmpeg_qsv.c @@ -22,7 +22,6 @@ #include "libavutil/dict.h" #include "libavutil/hwcontext.h" #include "libavutil/hwcontext_qsv.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavcodec/qsv.h" diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index fa5420fec6..0553f41a61 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -28,7 +28,6 @@ */ #include "config.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" #include "aac.h" diff --git a/libavcodec/arbc.c b/libavcodec/arbc.c index 0f83a68758..d03fdf214b 100644 --- a/libavcodec/arbc.c +++ b/libavcodec/arbc.c @@ -26,7 +26,6 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/argo.c b/libavcodec/argo.c index 87c646f56c..94c65477c5 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -26,7 +26,6 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c index 9d00ebd281..e424a7443c 100644 --- a/libavcodec/dcadsp.c +++ b/libavcodec/dcadsp.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "dcadsp.h" diff --git a/libavcodec/dss_sp.c b/libavcodec/dss_sp.c index b904585b5d..050b412496 100644 --- a/libavcodec/dss_sp.c +++ b/libavcodec/dss_sp.c @@ -21,7 +21,6 @@ #include "libavutil/channel_layout.h" #include "libavutil/common.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c index 3dd97200b4..88bf5b9d74 100644 --- a/libavcodec/dvbsub_parser.c +++ b/libavcodec/dvbsub_parser.c @@ -23,7 +23,6 @@ #include #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 6ba40291d5..fb678beef3 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -19,7 +19,6 @@ #include #include "libavutil/common.h" -#include "libavutil/mem.h" #include "bsf.h" #include "bsf_internal.h" diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index dcc0071a36..9c7c91b617 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -25,7 +25,6 @@ #include "libavutil/avstring.h" #include "libavutil/internal.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "avcodec.h" #include "encode.h" diff --git a/libavcodec/mpegaudiodsp_template.c b/libavcodec/mpegaudiodsp_template.c index 97317967a2..fbbd94e486 100644 --- a/libavcodec/mpegaudiodsp_template.c +++ b/libavcodec/mpegaudiodsp_template.c @@ -21,7 +21,6 @@ #include #include "libavutil/attributes.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" diff --git a/libavcodec/opustab.h b/libavcodec/opustab.h index 4525837942..16011db758 100644 --- a/libavcodec/opustab.h +++ b/libavcodec/opustab.h @@ -23,8 +23,6 @@ #ifndef AVCODEC_OPUSTAB_H #define AVCODEC_OPUSTAB_H -#include "libavutil/mem.h" - #include extern const uint8_t ff_celt_band_end[]; diff --git a/libavcodec/rl.c b/libavcodec/rl.c index 93153ff723..fab96d63a1 100644 --- a/libavcodec/rl.c +++ b/libavcodec/rl.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "rl.h" diff --git a/libavcodec/snappy.c b/libavcodec/snappy.c index f5c4c6578b..91dd84fad4 100644 --- a/libavcodec/snappy.c +++ b/libavcodec/snappy.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/mem.h" - #include "bytestream.h" #include "snappy.h" diff --git a/libavcodec/truemotion2rt.c b/libavcodec/truemotion2rt.c index a2206a60e0..b6a19581a9 100644 --- a/libavcodec/truemotion2rt.c +++ b/libavcodec/truemotion2rt.c @@ -25,7 +25,6 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #define BITSTREAM_READER_LE #include "avcodec.h" diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index fe63518c3c..0c95728781 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -26,7 +26,6 @@ #include "v210dec.h" #include "libavutil/bswap.h" #include "libavutil/internal.h" -#include "libavutil/mem.h" #include "libavutil/intreadwrite.h" #include "thread.h" diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index 88143d16d1..797f229a28 100644 --- a/libavcodec/v210x.c +++ b/libavcodec/v210x.c @@ -22,7 +22,6 @@ #include "internal.h" #include "libavutil/bswap.h" #include "libavutil/internal.h" -#include "libavutil/mem.h" static av_cold int decode_init(AVCodecContext *avctx) { diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c index 2ae762af46..923c3e0a31 100644 --- a/libavcodec/x86/ac3dsp_init.c +++ b/libavcodec/x86/ac3dsp_init.c @@ -20,7 +20,6 @@ */ #include "libavutil/attributes.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/ac3.h" diff --git a/libavcodec/x86/lpc.c b/libavcodec/x86/lpc.c index 6c72e21bac..544083bd37 100644 --- a/libavcodec/x86/lpc.c +++ b/libavcodec/x86/lpc.c @@ -21,7 +21,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" +#include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/lpc.h" diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 79a617ffbe..7a05ab14ad 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -28,7 +28,6 @@ #include "libavcodec/rv34dsp.h" #include "libavutil/attributes.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/cpu.h" #include "hpeldsp.h" diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index c1c4d76262..4294b86028 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -26,7 +26,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" diff --git a/libavcodec/x86/videodsp_init.c b/libavcodec/x86/videodsp_init.c index eeebb41547..961424aa13 100644 --- a/libavcodec/x86/videodsp_init.c +++ b/libavcodec/x86/videodsp_init.c @@ -24,7 +24,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/videodsp.h" diff --git a/libavcodec/x86/vp8dsp_init.c b/libavcodec/x86/vp8dsp_init.c index dffa7a2418..289f1d5115 100644 --- a/libavcodec/x86/vp8dsp_init.c +++ b/libavcodec/x86/vp8dsp_init.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vp8dsp.h" diff --git a/libavcodec/x86/vp9dsp_init.c b/libavcodec/x86/vp9dsp_init.c index 837cce8508..8d11dbc348 100644 --- a/libavcodec/x86/vp9dsp_init.c +++ b/libavcodec/x86/vp9dsp_init.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vp9dsp.h" #include "libavcodec/x86/vp9dsp_init.h" diff --git a/libavcodec/x86/vp9dsp_init_16bpp_template.c b/libavcodec/x86/vp9dsp_init_16bpp_template.c index b56afc7f50..f93ea2468e 100644 --- a/libavcodec/x86/vp9dsp_init_16bpp_template.c +++ b/libavcodec/x86/vp9dsp_init_16bpp_template.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vp9dsp.h" #include "libavcodec/x86/vp9dsp_init.h" diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c index b73f31f1ef..368907037b 100644 --- a/libavdevice/fbdev_dec.c +++ b/libavdevice/fbdev_dec.c @@ -36,7 +36,6 @@ #include "libavutil/internal.h" #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/time.h" #include "libavutil/parseutils.h" diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c index e8d8d7b85b..898a630aa1 100644 --- a/libavdevice/fbdev_enc.c +++ b/libavdevice/fbdev_enc.c @@ -25,7 +25,6 @@ #include #include "libavutil/pixdesc.h" #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavformat/avformat.h" #include "fbdev_common.h" diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index dba02d4130..623878fe7f 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -34,7 +34,6 @@ #endif #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavformat/avformat.h" diff --git a/libavfilter/boxblur.h b/libavfilter/boxblur.h index 5694722a9d..214d4e0c93 100644 --- a/libavfilter/boxblur.h +++ b/libavfilter/boxblur.h @@ -25,7 +25,6 @@ #include "libavutil/eval.h" #include "libavutil/pixdesc.h" -#include "libavutil/mem.h" #include "avfilter.h" diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index f95e12091b..9bfb96211d 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -25,7 +25,6 @@ #include "libavutil/avutil.h" #include "libavutil/colorspace.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "drawutils.h" #include "formats.h" diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index 0e645f50f2..b05d1f2393 100644 --- a/libavfilter/vf_deinterlace_vaapi.c +++ b/libavfilter/vf_deinterlace_vaapi.c @@ -20,7 +20,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index 08a0917258..8bfdcdfa07 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -18,7 +18,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_neighbor_opencl.c b/libavfilter/vf_neighbor_opencl.c index a41fd384a1..e00245089d 100644 --- a/libavfilter/vf_neighbor_opencl.c +++ b/libavfilter/vf_neighbor_opencl.c @@ -20,7 +20,6 @@ #include "libavutil/common.h" #include "libavutil/imgutils.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/avstring.h" diff --git a/libavfilter/vf_overlay_cuda.c b/libavfilter/vf_overlay_cuda.c index 260b5c8fa2..5c578083c6 100644 --- a/libavfilter/vf_overlay_cuda.c +++ b/libavfilter/vf_overlay_cuda.c @@ -24,7 +24,6 @@ */ #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/hwcontext.h" diff --git a/libavfilter/vf_overlay_opencl.c b/libavfilter/vf_overlay_opencl.c index 8547bae278..6ba622baaa 100644 --- a/libavfilter/vf_overlay_opencl.c +++ b/libavfilter/vf_overlay_opencl.c @@ -17,7 +17,6 @@ */ #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index 9d0c813e6d..efc2ab832d 100644 --- a/libavfilter/vf_procamp_vaapi.c +++ b/libavfilter/vf_procamp_vaapi.c @@ -18,7 +18,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 0f0c5440e9..f914fd2cd7 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -19,7 +19,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index e85b3bb3ba..8cf7c099ee 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -20,7 +20,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index 179f7d77b9..9b3e2ad03b 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -18,7 +18,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/mastering_display_metadata.h" diff --git a/libavfilter/vf_transpose_opencl.c b/libavfilter/vf_transpose_opencl.c index f325d6633b..d354c3a4eb 100644 --- a/libavfilter/vf_transpose_opencl.c +++ b/libavfilter/vf_transpose_opencl.c @@ -20,7 +20,6 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_transpose_vaapi.c b/libavfilter/vf_transpose_vaapi.c index 3b29767c8d..2abe8517e0 100644 --- a/libavfilter/vf_transpose_vaapi.c +++ b/libavfilter/vf_transpose_vaapi.c @@ -18,7 +18,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_xfade_opencl.c b/libavfilter/vf_xfade_opencl.c index 23c084546d..5b64ea2f08 100644 --- a/libavfilter/vf_xfade_opencl.c +++ b/libavfilter/vf_xfade_opencl.c @@ -17,7 +17,6 @@ */ #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/video.c b/libavfilter/video.c index 7a8e587798..ee1d440bb2 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -27,7 +27,6 @@ #include "libavutil/buffer.h" #include "libavutil/hwcontext.h" #include "libavutil/imgutils.h" -#include "libavutil/mem.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/x86/vf_atadenoise_init.c b/libavfilter/x86/vf_atadenoise_init.c index 3f87f3c445..e7a653f191 100644 --- a/libavfilter/x86/vf_atadenoise_init.c +++ b/libavfilter/x86/vf_atadenoise_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/atadenoise.h" diff --git a/libavfilter/x86/vf_bwdif_init.c b/libavfilter/x86/vf_bwdif_init.c index b1e70b3bc6..f632c4f340 100644 --- a/libavfilter/x86/vf_bwdif_init.c +++ b/libavfilter/x86/vf_bwdif_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/bwdif.h" diff --git a/libavfilter/x86/vf_eq_init.c b/libavfilter/x86/vf_eq_init.c index 274325074a..113056e76b 100644 --- a/libavfilter/x86/vf_eq_init.c +++ b/libavfilter/x86/vf_eq_init.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavutil/x86/asm.h" #include "libavfilter/vf_eq.h" diff --git a/libavfilter/x86/vf_gradfun_init.c b/libavfilter/x86/vf_gradfun_init.c index 4009711701..56e6774a79 100644 --- a/libavfilter/x86/vf_gradfun_init.c +++ b/libavfilter/x86/vf_gradfun_init.c @@ -21,7 +21,6 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavfilter/gradfun.h" diff --git a/libavfilter/x86/vf_idet_init.c b/libavfilter/x86/vf_idet_init.c index ca175e2d40..d4d9bd0893 100644 --- a/libavfilter/x86/vf_idet_init.c +++ b/libavfilter/x86/vf_idet_init.c @@ -18,7 +18,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/vf_idet.h" diff --git a/libavfilter/x86/vf_maskedclamp_init.c b/libavfilter/x86/vf_maskedclamp_init.c index 53153f80ea..2a5388abac 100644 --- a/libavfilter/x86/vf_maskedclamp_init.c +++ b/libavfilter/x86/vf_maskedclamp_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/maskedclamp.h" diff --git a/libavfilter/x86/vf_transpose_init.c b/libavfilter/x86/vf_transpose_init.c index 6bb9908725..95c56eab73 100644 --- a/libavfilter/x86/vf_transpose_init.c +++ b/libavfilter/x86/vf_transpose_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/transpose.h" diff --git a/libavfilter/x86/vf_w3fdif_init.c b/libavfilter/x86/vf_w3fdif_init.c index d4534bb1ed..16202fba76 100644 --- a/libavfilter/x86/vf_w3fdif_init.c +++ b/libavfilter/x86/vf_w3fdif_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavfilter/w3fdif.h" diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index c39bc44da6..66cbee8510 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/mem.h" #include "libavutil/x86/cpu.h" #include "libavfilter/yadif.h" diff --git a/libavformat/replaygain.c b/libavformat/replaygain.c index 707d3cd4f1..24f5c74183 100644 --- a/libavformat/replaygain.c +++ b/libavformat/replaygain.c @@ -29,7 +29,6 @@ #include "libavutil/dict.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" -#include "libavutil/mem.h" #include "libavutil/replaygain.h" #include "avformat.h" diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c index b7f0f71c2d..a20cb15b01 100644 --- a/libavutil/avsscanf.c +++ b/libavutil/avsscanf.c @@ -29,7 +29,6 @@ #include "config.h" #include "common.h" -#include "mem.h" #include "avassert.h" #include "avstring.h" #include "bprint.h" diff --git a/libavutil/tests/aes_ctr.c b/libavutil/tests/aes_ctr.c index 53d0e4a244..9dbf0af8aa 100644 --- a/libavutil/tests/aes_ctr.c +++ b/libavutil/tests/aes_ctr.c @@ -17,7 +17,6 @@ */ #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavutil/aes_ctr.h" diff --git a/tests/checkasm/llviddspenc.c b/tests/checkasm/llviddspenc.c index 132f6d2771..4ec46c96bd 100644 --- a/tests/checkasm/llviddspenc.c +++ b/tests/checkasm/llviddspenc.c @@ -22,7 +22,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libavcodec/lossless_videoencdsp.h" diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c index c29b75d09b..7cd815e5be 100644 --- a/tests/checkasm/sw_rgb.c +++ b/tests/checkasm/sw_rgb.c @@ -21,7 +21,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libswscale/rgb2rgb.h" diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c index 3ac0f9082f..02fd939e13 100644 --- a/tests/checkasm/sw_scale.c +++ b/tests/checkasm/sw_scale.c @@ -21,7 +21,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem.h" #include "libavutil/mem_internal.h" #include "libswscale/swscale.h" diff --git a/tools/ffhash.c b/tools/ffhash.c index 6942527732..9aa5ffdf88 100644 --- a/tools/ffhash.c +++ b/tools/ffhash.c @@ -24,11 +24,11 @@ #include "libavutil/avstring.h" #include "libavutil/error.h" #include "libavutil/hash.h" -#include "libavutil/mem.h" #include #include #include +#include #include #if HAVE_IO_H From patchwork Mon Jun 14 22:41:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28278 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247475iol; Mon, 14 Jun 2021 15:43:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKSXp+ydkzEZY7NXA30sMwNX9dhhgR6O0k408+Q1DvbnqLoHV2Ry++iV7KK37Qil+9crF6 X-Received: by 2002:a17:906:3485:: with SMTP id g5mr17216151ejb.174.1623710610432; Mon, 14 Jun 2021 15:43: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 h9si12317417edw.186.2021.06.14.15.43.30; Mon, 14 Jun 2021 15:43: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="KU/Sci04"; 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 2E7EB689BD5; Tue, 15 Jun 2021 01:42:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2058.outbound.protection.outlook.com [40.92.17.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31776689AF5 for ; Tue, 15 Jun 2021 01:42:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QozLWZ1Yw08ToldADwmRcct1yuBn/qW0Sd/25nUtTgcHw1DYbbRl3LBm64LmkBbNNfJI4M2ki172srVK00cfuaZVlSqGBluox+8Sj5qAuhbxHSIICXRAHg1EqxzEZpf2WBoI+pFkJC6r5SQzw6cjQGtiY/5amYVLfuFrwK9cBrpl/xRluAXRtGbmjGI+pj+D0PSHRFO3o8zC7PNCamQ6Rn3rrifzqwwZi1FB4R/FQsi3EqsLedHOwCBXf/LSRLcMjqmx6PdCwRqVAQ0NKx9KDOTvV7zpPL2nLSK+Xa2oQEiaRaNFLRYU/QbwrfzkwA4TV9DKEtpX1VYQgjgJTJ5PyA== 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=0NXuoZ++jDSu/R7GGbLotGCcxRvN1/LbVcaZBk/SwFQ=; b=mGJKkok1t7PZiAwc2zQCiGrDt5ASqeTcoDmPnH+YZGPtw0DdnqORvNB1ByPjrzTvjfP0viuu8Q3P3yLe8+1sll7DDLxAroCoWSGEO8bs6bktnINSwH8qIPxo7MMzDXhkH2YBPgeS2+PA3e7lXUTtxydsm2ZoMVQNSrToH9bQQ0UO35j7bSrrh74MpjGum71Y48dHEycHmzw+cCOpDCAmumZ6BbFZEnzrn7jJpN1pw+fANVPwGRD8g1s7OjClU4+w7XkbvO9zD5BqN5Ds0oYg7QGP2ukbuWHlf28LQylYwoic0qAWXdEYPNiVCk77q+GAg7s/AHx9HimWOKmkqKma7Q== 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=0NXuoZ++jDSu/R7GGbLotGCcxRvN1/LbVcaZBk/SwFQ=; b=KU/Sci04n4pwJLsNbUHshALrb2vhQ7P6FOpOBusoRviO5Q+4s55znhZD7O1DCH0a5H2fU7ocZje7LTvIVNC5uKxdsY/zTr7T3WUTkQNbg3s2GYL9tQbK3zanx6gj7c1bPoSMN47K51vUogEGsgCO0JQ37BflphDOW3ZlilPQhtgUss/Xg/eARSo/LW3RlKNDYtq9sCZAX1JnGOPvLM20/hCOIdzu2F0i9ay6t3c+thXi7ge7RD9/WMLdibggb5uMGgYicQJ1ESAyd1RLb+6KnFq0GE+3ehHa1XrEMqbFDupg+DZarWeQ9X6zmhOB6JBd5x7bnObQpdBFvHAynjyDuw== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::40) by DB8EUR06HT107.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::405) 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:42:02 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:02 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:09C6ABA1B3F5F7889D8E41C2922F0F9DC84A8661DF3D9C3BD2A5F0F0BD0FA5A7; UpperCasedChecksum:A1A482C194B0F11664D75FE2F02594216367B060A9EB6CC88965EA652F2A8846; SizeAsReceived:8790; Count:48 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:42:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:26 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Djpal5g4RbjnMlBYVou1Wo3xyOEaOizk] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:01 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3e5ab62b-346d-427f-abfe-08d92f85a089 X-MS-Exchange-SLBlob-MailProps: atMppv55ql/yVeMwx9wiFk9R10zbxBry9SgQl6WbZuKS/npa418DtU9Xr+UbEuT+BiOiAejR3BZx3D+ql3SxaSfIPbRydT87Hyl+3Rgh4LwDodUHUHmeNenht/G8FJmMDllQRQ6jTsav3iOSv8ckF1I6uR4EsgPz7VwuXt6h8CFCnW3Z4o/lxKR18pGWzJfN2CGFctcHwsKgMCgFdH880LHVXPzFndWRU4dZN94MhBz2HG6dWoCB/eNoTmi4kqaaRB/UOgHXLW4dLdrwze+4CrlflCx3zkrLQKBbr3wg3fjn/2quLDO/E4ZogfKNgBw38uHRM5bymfORfApn6aQ1i5H3Saaqv/IoF0LSh54FjbM6DhZUdBH3fUgXuCAQDDKz9nkdDqTz5NjrBbUBjZDDSxp0guXt3MzWo2p9i5PlBs7mjY1WsmXTAyIufIK5iPoKUsAmJdX22ph/VOJ61GuNpkX/eaIBNzzqK6VR831s7XehoC6WRrv54/0016yvED/bvlMS5OkUgrxqN9Bhmziz6Cf5qhMm9bXWyuNyNHWTbGtp3Qo7RcPLjvARg3wd+QwVhvR99Tki75wTIOU2Z2zii7MTC5SSRpsIen8RkG/1TZvRIY209ELYn6Lgy/M7p69rZE1hSULpeLWBbgF3paTPsBl+6xjCUYZMfLS+NHwkOPAsdOqVUV4n0/94W5g2Sd6umPYKaNLzlRAjKVaWlNWzIckMyp130P5f+j9KSOESEaazGymIWLKofE2sLgwH1ZohyBb3PLMq4HfY8cNPkTkl/lsnbpCLDgApE6AxbyOMQZ28sGtvfpcbe75Bdh5A2GuV+c0zQ0GrB9xa6ItCfyi1sJKzb7yUKUahxgC/2cM50dvCcyqJs3jgMAjOdHqFtiFIueZ24hc78jE1hBb4cr9rijrjC/oF3wFm X-MS-TrafficTypeDiagnostic: DB8EUR06HT107: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ETrBeLn0jDRq9bBF2UdriSHvG6VlA5nfWcLbIhMpa+rgE2aymu/ZtQFu1JaH2zPbh9VhdE6BzNP4koiSmRv9WqCZHNfoYewl10tjfX5mux7WiTnO/StonbhNIa0tpCcq3aSHwbgaumLrZXXROEQzGPBhTbBNTtxFeTSmYW7CLhmAwKWpk0sVcdhHNMiX/UT7yM4UsSKNwTJK02B2M3rBDlSStPDo273yVVOBNCC2Ckh99K9wkmY2jRB3sjQ8K5LCYob/fxgp071jCi2+MpbmzFmb19t2bNd8R6xBpj9QxTnuxITybGYnkO8Sjwgv/Rrtz8NAj1SmSKqf/cMISiLXVcU4tvFQNKVT0Ce2Lbq9EUt85g60/9qtx/ldU4hkmAJtFuVANJVvgxO9YG8anpesVGo5cda+KO+g0d6Nxa9KU2fLWeqnkt5AfirFvzPSqDaB X-MS-Exchange-AntiSpam-MessageData: PYeIHHsvWifLPtqUMbVWtbJqmiYT63C2kk3Oah8ojGg95TEkEnH4eFwuvZDHK/P9i6BJQmU9lOpJ0Xy3hlzoEikoxxAQP2d+fLz4J/a7gTQuX75zDl5CY5awbT0CLlJi/myg2sMvhx7vM6/lWLip9A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e5ab62b-346d-427f-abfe-08d92f85a089 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:02.4066 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT107 Subject: [FFmpeg-devel] [PATCH 10/17] Remove unnecessary avassert.h inclusions 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 , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xWjNZu4PIsnu From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- fftools/ffplay.c | 3 --- libavcodec/ass.c | 1 - libavcodec/cfhd.h | 2 -- libavcodec/cfhddsp.c | 1 - libavcodec/cfhdenc.c | 1 - libavcodec/cfhdencdsp.c | 1 - libavcodec/dirac_dwt.c | 1 - libavcodec/dstdec.c | 1 - libavcodec/ffv1.h | 1 - libavcodec/g729_parser.c | 1 - libavcodec/gif_parser.c | 1 - libavcodec/jpeg2000dwt.c | 1 - libavcodec/libopenjpegenc.c | 1 - libavcodec/libuavs3d.c | 1 - libavcodec/movtextenc.c | 1 - libavcodec/photocd.c | 1 - libavcodec/rasc.c | 1 - libavcodec/sga.c | 1 - libavcodec/sgidec.c | 1 - libavdevice/v4l2-common.h | 1 - libavdevice/v4l2.c | 1 + libavfilter/aeval.c | 1 - libavfilter/af_agate.c | 1 - libavfilter/af_aiir.c | 1 - libavfilter/af_alimiter.c | 1 - libavfilter/af_amultiply.c | 1 - libavfilter/af_anlms.c | 1 - libavfilter/af_asetnsamples.c | 1 - libavfilter/af_asr.c | 1 - libavfilter/af_axcorrelate.c | 1 - libavfilter/af_join.c | 1 - libavfilter/af_lv2.c | 1 - libavfilter/af_mcompand.c | 1 - libavfilter/af_sidechaincompress.c | 1 - libavfilter/avf_abitscope.c | 1 - libavfilter/avf_aphasemeter.c | 1 - libavfilter/avf_concat.c | 1 - libavfilter/avf_showcqt.c | 1 - libavfilter/buffersrc.c | 1 - libavfilter/dnn/dnn_backend_native_layer_depth2space.c | 1 - libavfilter/dnn/dnn_backend_native_layer_mathbinary.c | 1 - libavfilter/dnn/dnn_backend_native_layer_mathunary.c | 1 - libavfilter/dnn/dnn_backend_native_layer_maximum.c | 1 - libavfilter/dnn/queue.c | 1 - libavfilter/drawutils.c | 1 - libavfilter/f_loop.c | 1 - libavfilter/src_movie.c | 1 - libavfilter/trim.c | 1 - libavfilter/vf_bm3d.c | 1 - libavfilter/vf_bwdif.c | 1 - libavfilter/vf_cover_rect.c | 1 - libavfilter/vf_datascope.c | 1 - libavfilter/vf_deinterlace_vaapi.c | 1 - libavfilter/vf_epx.c | 1 - libavfilter/vf_fftdnoiz.c | 1 - libavfilter/vf_freezedetect.c | 1 - libavfilter/vf_freezeframes.c | 1 - libavfilter/vf_fspp.c | 1 - libavfilter/vf_histogram.c | 1 - libavfilter/vf_lensfun.c | 1 - libavfilter/vf_median.c | 1 - libavfilter/vf_mestimate.c | 1 - libavfilter/vf_minterpolate.c | 1 - libavfilter/vf_misc_vaapi.c | 1 - libavfilter/vf_nnedi.c | 1 - libavfilter/vf_overlay_qsv.c | 1 - libavfilter/vf_pp7.c | 1 - libavfilter/vf_procamp_vaapi.c | 1 - libavfilter/vf_scale.c | 1 - libavfilter/vf_scale_vaapi.c | 1 - libavfilter/vf_scdet.c | 1 - libavfilter/vf_showpalette.c | 1 - libavfilter/vf_shuffleframes.c | 1 - libavfilter/vf_spp.c | 1 - libavfilter/vf_tonemap_vaapi.c | 1 - libavfilter/vf_tpad.c | 1 - libavfilter/vf_transpose_opencl.c | 1 - libavfilter/vf_transpose_vaapi.c | 1 - libavfilter/vf_vignette.c | 1 - libavfilter/vf_vpp_qsv.c | 1 - libavfilter/vf_waveform.c | 1 - libavfilter/vf_xbr.c | 1 - libavfilter/vf_yadif.c | 1 - libavfilter/vf_zoompan.c | 1 - libavfilter/vf_zscale.c | 1 - libavfilter/video.c | 1 - libavformat/aaxdec.c | 1 - libavformat/apm.c | 1 - libavformat/concatdec.c | 1 - libavformat/dash.c | 1 - libavformat/fifo_test.c | 1 - libavformat/gif.c | 1 - libavformat/hashenc.c | 1 - libavformat/img2enc.c | 1 - libavformat/imx.c | 1 - libavformat/libsrt.c | 1 - libavformat/mxfdec.c | 1 - libavformat/rawdec.c | 1 - libavformat/rtpdec_asf.c | 1 - libavformat/sapdec.c | 1 - libavformat/subfile.c | 1 - libavformat/subtitles.c | 1 - libavformat/tests/fifo_muxer.c | 1 - libavformat/westwood_audenc.c | 2 -- libavutil/avsscanf.c | 1 - libavutil/bprint.c | 1 - libavutil/mem.c | 1 - libavutil/tests/bprint.c | 1 + libavutil/tx_priv.h | 1 - 109 files changed, 2 insertions(+), 111 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 833830bfc8..6b19574eae 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -40,7 +40,6 @@ #include "libavutil/fifo.h" #include "libavutil/parseutils.h" #include "libavutil/samplefmt.h" -#include "libavutil/avassert.h" #include "libavutil/time.h" #include "libavutil/bprint.h" #include "libavformat/avformat.h" @@ -61,8 +60,6 @@ #include "cmdutils.h" -#include - const char program_name[] = "ffplay"; const int program_birth_year = 2003; diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 627741936a..907e2d7b88 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -21,7 +21,6 @@ #include "avcodec.h" #include "ass.h" -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/common.h" diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h index 19e5c7cf03..4c066da5fc 100644 --- a/libavcodec/cfhd.h +++ b/libavcodec/cfhd.h @@ -23,8 +23,6 @@ #include -#include "libavutil/avassert.h" - #include "avcodec.h" #include "bytestream.h" #include "get_bits.h" diff --git a/libavcodec/cfhddsp.c b/libavcodec/cfhddsp.c index 4028263f7a..da9254c718 100644 --- a/libavcodec/cfhddsp.c +++ b/libavcodec/cfhddsp.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/common.h" -#include "libavutil/avassert.h" #include "cfhddsp.h" diff --git a/libavcodec/cfhdenc.c b/libavcodec/cfhdenc.c index 968962102f..38e4acb4f0 100644 --- a/libavcodec/cfhdenc.c +++ b/libavcodec/cfhdenc.c @@ -26,7 +26,6 @@ #include #include -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavcodec/cfhdencdsp.c b/libavcodec/cfhdencdsp.c index b979e9e09a..5bd4d1ba0d 100644 --- a/libavcodec/cfhdencdsp.c +++ b/libavcodec/cfhdencdsp.c @@ -20,7 +20,6 @@ #include "libavutil/attributes.h" #include "libavutil/common.h" -#include "libavutil/avassert.h" #include "cfhdencdsp.h" diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c index cc08f8865a..fffaf82e23 100644 --- a/libavcodec/dirac_dwt.c +++ b/libavcodec/dirac_dwt.c @@ -20,7 +20,6 @@ */ #include "libavutil/attributes.h" -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "dirac_dwt.h" diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 7be97126ca..6d0b25f4c3 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -25,7 +25,6 @@ * ISO/IEC 14496-3 Part 3 Subpart 10: Technical description of lossless coding of oversampled audio */ -#include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem_internal.h" #include "internal.h" diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 147fe7ae16..473780c876 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -28,7 +28,6 @@ * FF Video Codec 1 (a lossless codec) */ -#include "libavutil/avassert.h" #include "libavutil/crc.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" diff --git a/libavcodec/g729_parser.c b/libavcodec/g729_parser.c index 76d6f93808..8c06ce4ee6 100644 --- a/libavcodec/g729_parser.c +++ b/libavcodec/g729_parser.c @@ -25,7 +25,6 @@ * Splits packets into individual blocks. */ -#include "libavutil/avassert.h" #include "parser.h" #include "g729.h" diff --git a/libavcodec/gif_parser.c b/libavcodec/gif_parser.c index a32bfa570a..4c18c00d7d 100644 --- a/libavcodec/gif_parser.c +++ b/libavcodec/gif_parser.c @@ -24,7 +24,6 @@ * GIF parser */ -#include "libavutil/avassert.h" #include "libavutil/bswap.h" #include "libavutil/common.h" diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index f418454ee9..f9a0977407 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -25,7 +25,6 @@ * Discrete wavelet transform */ -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/mem.h" #include "jpeg2000dwt.h" diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 051d644c0d..7d29b34b04 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -24,7 +24,6 @@ * JPEG 2000 encoder using libopenjpeg */ -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c index 1d523c8722..0b5c6268a4 100644 --- a/libavcodec/libuavs3d.c +++ b/libavcodec/libuavs3d.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/common.h" #include "libavutil/cpu.h" diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 383125b4ba..a6a1808592 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -22,7 +22,6 @@ #include #include "avcodec.h" #include "libavutil/opt.h" -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" diff --git a/libavcodec/photocd.c b/libavcodec/photocd.c index f95d5a8eb8..50b465c1cd 100644 --- a/libavcodec/photocd.c +++ b/libavcodec/photocd.c @@ -31,7 +31,6 @@ #define CACHED_BITSTREAM_READER !ARCH_X86_32 -#include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavcodec/rasc.c b/libavcodec/rasc.c index c1e9185192..7fedf73878 100644 --- a/libavcodec/rasc.c +++ b/libavcodec/rasc.c @@ -24,7 +24,6 @@ #include #include -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavcodec/sga.c b/libavcodec/sga.c index 5103d01f85..1bc6b0b140 100644 --- a/libavcodec/sga.c +++ b/libavcodec/sga.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index aa77a3b921..5fa3bf4a41 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -20,7 +20,6 @@ */ #include "libavutil/imgutils.h" -#include "libavutil/avassert.h" #include "avcodec.h" #include "bytestream.h" #include "internal.h" diff --git a/libavdevice/v4l2-common.h b/libavdevice/v4l2-common.h index 0cbaec8bb9..c7bed3e3b4 100644 --- a/libavdevice/v4l2-common.h +++ b/libavdevice/v4l2-common.h @@ -35,7 +35,6 @@ #endif #include #endif -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 981b6207fb..1c0de118cc 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -32,6 +32,7 @@ #include +#include "libavutil/avassert.h" #include "v4l2-common.h" #include diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c index ed7cf502de..007758bf57 100644 --- a/libavfilter/aeval.c +++ b/libavfilter/aeval.c @@ -23,7 +23,6 @@ * eval audio source */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/eval.h" diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index a70af800c8..3c858021d1 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -24,7 +24,6 @@ */ #include "libavutil/audio_fifo.h" -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index a95f66d6bc..6ac39872ef 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -20,7 +20,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c index 6ffb585f29..30f1a4cba5 100644 --- a/libavfilter/af_alimiter.c +++ b/libavfilter/af_alimiter.c @@ -24,7 +24,6 @@ * Lookahead limiter filter */ -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavfilter/af_amultiply.c b/libavfilter/af_amultiply.c index 1cf67ac186..b50bbfb6ce 100644 --- a/libavfilter/af_amultiply.c +++ b/libavfilter/af_amultiply.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/float_dsp.h" diff --git a/libavfilter/af_anlms.c b/libavfilter/af_anlms.c index 9564441391..26df40107f 100644 --- a/libavfilter/af_anlms.c +++ b/libavfilter/af_anlms.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/float_dsp.h" diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c index e05bb80e7a..9987eff8a2 100644 --- a/libavfilter/af_asetnsamples.c +++ b/libavfilter/af_asetnsamples.c @@ -24,7 +24,6 @@ * Filter that changes number of samples on single output operation */ -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" diff --git a/libavfilter/af_asr.c b/libavfilter/af_asr.c index ff9eff4e38..b34cdd38ee 100644 --- a/libavfilter/af_asr.c +++ b/libavfilter/af_asr.c @@ -20,7 +20,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" diff --git a/libavfilter/af_axcorrelate.c b/libavfilter/af_axcorrelate.c index abd722b83e..cec39dee76 100644 --- a/libavfilter/af_axcorrelate.c +++ b/libavfilter/af_axcorrelate.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/audio_fifo.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index eb60fe9b29..98b6389306 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -24,7 +24,6 @@ * a single output */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c index 53a58a46ea..cc5d702e27 100644 --- a/libavfilter/af_lv2.c +++ b/libavfilter/af_lv2.c @@ -28,7 +28,6 @@ #include #include -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c index ab1c2bff53..08d93f8c6a 100644 --- a/libavfilter/af_mcompand.c +++ b/libavfilter/af_mcompand.c @@ -28,7 +28,6 @@ * audio multiband compand filter */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/ffmath.h" #include "libavutil/opt.h" diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index d20ab57990..71e27d4530 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -25,7 +25,6 @@ */ #include "libavutil/audio_fifo.h" -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavfilter/avf_abitscope.c b/libavfilter/avf_abitscope.c index c38c73e0e5..481a218e6e 100644 --- a/libavfilter/avf_abitscope.c +++ b/libavfilter/avf_abitscope.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index ea529d3fee..ef7e50e657 100644 --- a/libavfilter/avf_aphasemeter.c +++ b/libavfilter/avf_aphasemeter.c @@ -23,7 +23,6 @@ * audio to video multimedia aphasemeter filter */ -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index f5cd8c11a7..cb46f52a04 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -23,7 +23,6 @@ * concat audio-video filter */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c index 37589dd151..f1d8f16b32 100644 --- a/libavfilter/avf_showcqt.c +++ b/libavfilter/avf_showcqt.c @@ -20,7 +20,6 @@ #include "config.h" #include "libavcodec/avfft.h" -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/xga_font_data.h" diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 29c01285cd..4d0bb4f91d 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -25,7 +25,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/frame.h" diff --git a/libavfilter/dnn/dnn_backend_native_layer_depth2space.c b/libavfilter/dnn/dnn_backend_native_layer_depth2space.c index 2fde6d1ba4..30ced43cd5 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_depth2space.c +++ b/libavfilter/dnn/dnn_backend_native_layer_depth2space.c @@ -24,7 +24,6 @@ */ #include "dnn_backend_native.h" -#include "libavutil/avassert.h" #include "dnn_backend_native_layer_depth2space.h" int ff_dnn_load_layer_depth2space(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num) diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c index 1c33b4633d..81901c56d9 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c @@ -24,7 +24,6 @@ */ #include "dnn_backend_native.h" -#include "libavutil/avassert.h" #include "dnn_backend_native_layer_mathbinary.h" typedef float (*FunType)(float src0, float src1); diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c index bd28ec67d1..b8694910d9 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c @@ -26,7 +26,6 @@ #include #include "dnn_backend_native.h" -#include "libavutil/avassert.h" #include "dnn_backend_native_layer_mathunary.h" int ff_dnn_load_layer_math_unary(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num) diff --git a/libavfilter/dnn/dnn_backend_native_layer_maximum.c b/libavfilter/dnn/dnn_backend_native_layer_maximum.c index 65af553765..a38759eeee 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_maximum.c +++ b/libavfilter/dnn/dnn_backend_native_layer_maximum.c @@ -24,7 +24,6 @@ */ #include "dnn_backend_native.h" -#include "libavutil/avassert.h" #include "dnn_backend_native_layer_maximum.h" int ff_dnn_load_layer_maximum(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num) diff --git a/libavfilter/dnn/queue.c b/libavfilter/dnn/queue.c index 954437a8b4..1f84c2dec7 100644 --- a/libavfilter/dnn/queue.c +++ b/libavfilter/dnn/queue.c @@ -21,7 +21,6 @@ #include #include "queue.h" #include "libavutil/mem.h" -#include "libavutil/avassert.h" typedef struct QueueEntry QueueEntry; diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 9bfb96211d..88218b913f 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -21,7 +21,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/colorspace.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c index 15f6076a67..a06e8172d3 100644 --- a/libavfilter/f_loop.c +++ b/libavfilter/f_loop.c @@ -19,7 +19,6 @@ */ #include "libavutil/audio_fifo.h" -#include "libavutil/avassert.h" #include "libavutil/fifo.h" #include "libavutil/internal.h" #include "libavutil/opt.h" diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 92b092fac6..7d97295dd0 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -32,7 +32,6 @@ #include "libavutil/attributes.h" #include "libavutil/avstring.h" -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" diff --git a/libavfilter/trim.c b/libavfilter/trim.c index 4f842eb7ff..261dacbc5c 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -20,7 +20,6 @@ #include "config.h" -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/log.h" diff --git a/libavfilter/vf_bm3d.c b/libavfilter/vf_bm3d.c index 326b258616..f719e79cb0 100644 --- a/libavfilter/vf_bm3d.c +++ b/libavfilter/vf_bm3d.c @@ -32,7 +32,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index 49b6e73f11..228067c8e5 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -28,7 +28,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c index 26a0fb3a4d..337778224d 100644 --- a/libavfilter/vf_cover_rect.c +++ b/libavfilter/vf_cover_rect.c @@ -22,7 +22,6 @@ * @todo switch to dualinput */ -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "internal.h" diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index 3af22771b2..63c93fd98d 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index b05d1f2393..fa71947098 100644 --- a/libavfilter/vf_deinterlace_vaapi.c +++ b/libavfilter/vf_deinterlace_vaapi.c @@ -18,7 +18,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_epx.c b/libavfilter/vf_epx.c index 731ba821a8..676513c302 100644 --- a/libavfilter/vf_epx.c +++ b/libavfilter/vf_epx.c @@ -17,7 +17,6 @@ */ #include "libavutil/opt.h" -#include "libavutil/avassert.h" #include "libavutil/pixdesc.h" #include "internal.h" diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c index 7f4a6d88cf..54e5fd3d2b 100644 --- a/libavfilter/vf_fftdnoiz.c +++ b/libavfilter/vf_fftdnoiz.c @@ -18,7 +18,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_freezedetect.c b/libavfilter/vf_freezedetect.c index d5978ae3aa..9cf8fbab15 100644 --- a/libavfilter/vf_freezedetect.c +++ b/libavfilter/vf_freezedetect.c @@ -21,7 +21,6 @@ * video freeze detection filter */ -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_freezeframes.c b/libavfilter/vf_freezeframes.c index 58ffd9dd33..e29eb07cec 100644 --- a/libavfilter/vf_freezeframes.c +++ b/libavfilter/vf_freezeframes.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/internal.h" diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c index d14c05cb5e..44d22fc1e4 100644 --- a/libavfilter/vf_fspp.c +++ b/libavfilter/vf_fspp.c @@ -35,7 +35,6 @@ * project, and ported by Arwa Arif for FFmpeg. */ -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 0862b2ae2a..bd9408c42d 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/colorspace.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" diff --git a/libavfilter/vf_lensfun.c b/libavfilter/vf_lensfun.c index e9bb69187e..f34add961a 100644 --- a/libavfilter/vf_lensfun.c +++ b/libavfilter/vf_lensfun.c @@ -28,7 +28,6 @@ #include #include -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libswscale/swscale.h" diff --git a/libavfilter/vf_median.c b/libavfilter/vf_median.c index 4d8037df25..1e66ab87ff 100644 --- a/libavfilter/vf_median.c +++ b/libavfilter/vf_median.c @@ -20,7 +20,6 @@ * are permitted provided that the following conditions are met: */ -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_mestimate.c b/libavfilter/vf_mestimate.c index daf7fde95f..e50b52818c 100644 --- a/libavfilter/vf_mestimate.c +++ b/libavfilter/vf_mestimate.c @@ -20,7 +20,6 @@ #include "motion_estimation.h" #include "libavcodec/mathops.h" -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index 77462dbd5d..c6aed7755f 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -21,7 +21,6 @@ #include "motion_estimation.h" #include "libavcodec/mathops.h" -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/motion_vector.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index 8bfdcdfa07..ca0d46ff19 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -17,7 +17,6 @@ */ #include -#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index 6096e88812..da9bc0866d 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -21,7 +21,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/imgutils.h" diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c index 7a4afd77d4..14c4c37a3c 100644 --- a/libavfilter/vf_overlay_qsv.c +++ b/libavfilter/vf_overlay_qsv.c @@ -27,7 +27,6 @@ #include "libavutil/eval.h" #include "libavutil/hwcontext.h" #include "libavutil/avstring.h" -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/mathematics.h" diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c index c53a8716cb..a9a2fa3d19 100644 --- a/libavfilter/vf_pp7.c +++ b/libavfilter/vf_pp7.c @@ -27,7 +27,6 @@ * project, and ported by Arwa Arif for FFmpeg. */ -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index efc2ab832d..5527556d09 100644 --- a/libavfilter/vf_procamp_vaapi.c +++ b/libavfilter/vf_procamp_vaapi.c @@ -17,7 +17,6 @@ */ #include -#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 759499395f..dfc7d5bfa4 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -39,7 +39,6 @@ #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" -#include "libavutil/avassert.h" #include "libswscale/swscale.h" static const char *const var_names[] = { diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index f914fd2cd7..41ff93156d 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -18,7 +18,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_scdet.c b/libavfilter/vf_scdet.c index 3f7b7c5f25..ff8bf21a9c 100644 --- a/libavfilter/vf_scdet.c +++ b/libavfilter/vf_scdet.c @@ -21,7 +21,6 @@ * video scene change detection filter */ -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_showpalette.c b/libavfilter/vf_showpalette.c index 588fd2faab..2455af687c 100644 --- a/libavfilter/vf_showpalette.c +++ b/libavfilter/vf_showpalette.c @@ -21,7 +21,6 @@ * Display frame palette (AV_PIX_FMT_PAL8) */ -#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "avfilter.h" #include "formats.h" diff --git a/libavfilter/vf_shuffleframes.c b/libavfilter/vf_shuffleframes.c index 6424e4ee2c..cdc70f552e 100644 --- a/libavfilter/vf_shuffleframes.c +++ b/libavfilter/vf_shuffleframes.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/internal.h" diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index d93c4a5606..cfa1cb77c4 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -31,7 +31,6 @@ * ported by Clément Bœsch for FFmpeg. */ -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index 9b3e2ad03b..d33c4f8f6d 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -17,7 +17,6 @@ */ #include -#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/mastering_display_metadata.h" diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c index 2d89537abd..d23869f3e2 100644 --- a/libavfilter/vf_tpad.c +++ b/libavfilter/vf_tpad.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" diff --git a/libavfilter/vf_transpose_opencl.c b/libavfilter/vf_transpose_opencl.c index d354c3a4eb..2877d3c826 100644 --- a/libavfilter/vf_transpose_opencl.c +++ b/libavfilter/vf_transpose_opencl.c @@ -17,7 +17,6 @@ */ #include -#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_transpose_vaapi.c b/libavfilter/vf_transpose_vaapi.c index 2abe8517e0..79413e0eeb 100644 --- a/libavfilter/vf_transpose_vaapi.c +++ b/libavfilter/vf_transpose_vaapi.c @@ -17,7 +17,6 @@ */ #include -#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_vignette.c b/libavfilter/vf_vignette.c index e5842b19da..91754306ae 100644 --- a/libavfilter/vf_vignette.c +++ b/libavfilter/vf_vignette.c @@ -22,7 +22,6 @@ #include "libavutil/opt.h" #include "libavutil/eval.h" -#include "libavutil/avassert.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "formats.h" diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index b9ab5c6490..af2ce72254 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -25,7 +25,6 @@ #include "libavutil/opt.h" #include "libavutil/eval.h" -#include "libavutil/avassert.h" #include "libavutil/pixdesc.h" #include "libavutil/mathematics.h" diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c index 2fa1815d6c..977ebad9ce 100644 --- a/libavfilter/vf_waveform.c +++ b/libavfilter/vf_waveform.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index 7226c03783..1300693bac 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -29,7 +29,6 @@ */ #include "libavutil/opt.h" -#include "libavutil/avassert.h" #include "libavutil/pixdesc.h" #include "internal.h" diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index b0d9fbaf1f..853e1f8f31 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/cpu.h" #include "libavutil/common.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c index e18ebb4f11..9115c23dc4 100644 --- a/libavfilter/vf_zoompan.c +++ b/libavfilter/vf_zoompan.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/eval.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index f77aa720c4..d21de8d9db 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -42,7 +42,6 @@ #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" -#include "libavutil/avassert.h" #define ZIMG_ALIGNMENT 32 diff --git a/libavfilter/video.c b/libavfilter/video.c index ee1d440bb2..0771268c40 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -23,7 +23,6 @@ #include #include -#include "libavutil/avassert.h" #include "libavutil/buffer.h" #include "libavutil/hwcontext.h" #include "libavutil/imgutils.h" diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c index 0cbf933dfd..dc3754710e 100644 --- a/libavformat/aaxdec.c +++ b/libavformat/aaxdec.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/apm.c b/libavformat/apm.c index d5499f1d90..3713700365 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -22,7 +22,6 @@ #include "avformat.h" #include "internal.h" #include "rawenc.h" -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 20912e797e..231b519f39 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/dash.c b/libavformat/dash.c index d2501f013a..d7ba8540d7 100644 --- a/libavformat/dash.c +++ b/libavformat/dash.c @@ -24,7 +24,6 @@ #include #endif -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" diff --git a/libavformat/fifo_test.c b/libavformat/fifo_test.c index 62670d6d5d..80c0c84612 100644 --- a/libavformat/fifo_test.c +++ b/libavformat/fifo_test.c @@ -23,7 +23,6 @@ #include "libavutil/opt.h" #include "libavutil/time.h" -#include "libavutil/avassert.h" #include "avformat.h" #include "url.h" diff --git a/libavformat/gif.c b/libavformat/gif.c index e4f2249083..cba87d3eae 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -23,7 +23,6 @@ #include "avformat.h" #include "internal.h" -#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index a1e98eda89..6ab5bd8879 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/hash.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 7b5133d300..655595374d 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -21,7 +21,6 @@ */ #include "libavutil/intreadwrite.h" -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/dict.h" #include "libavutil/log.h" diff --git a/libavformat/imx.c b/libavformat/imx.c index 6d3a5ad8d7..e8ca79d057 100644 --- a/libavformat/imx.c +++ b/libavformat/imx.c @@ -23,7 +23,6 @@ #include "avformat.h" #include "internal.h" #include "libavutil/intreadwrite.h" -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/internal.h" diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 8dee6aa3f3..e5701625b8 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -23,7 +23,6 @@ #include -#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/time.h" diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 7b40076fb4..01a2dbe060 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -47,7 +47,6 @@ #include #include "libavutil/aes.h" -#include "libavutil/avassert.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/mathematics.h" #include "libavcodec/bytestream.h" diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index a1f593c66a..4666c6380d 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -27,7 +27,6 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" -#include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" #define RAW_PACKET_SIZE 1024 diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index f6e7f00bbe..3802a57407 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -25,7 +25,6 @@ * @author Ronald S. Bultje */ -#include "libavutil/avassert.h" #include "libavutil/base64.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index 05a6d59086..a852b0782b 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -20,7 +20,6 @@ */ #include "avformat.h" -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "network.h" diff --git a/libavformat/subfile.c b/libavformat/subfile.c index 300672e657..2936c79e06 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" #include "avformat.h" diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index 05c07cd852..013d049bc3 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -21,7 +21,6 @@ #include "avformat.h" #include "subtitles.h" #include "avio_internal.h" -#include "libavutil/avassert.h" #include "libavutil/avstring.h" void ff_text_init_avio(void *s, FFTextReader *r, AVIOContext *pb) diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c index 227c3d0210..11a557c1a0 100644 --- a/libavformat/tests/fifo_muxer.c +++ b/libavformat/tests/fifo_muxer.c @@ -22,7 +22,6 @@ #include #include "libavutil/opt.h" #include "libavutil/time.h" -#include "libavutil/avassert.h" #include "libavformat/avformat.h" #include "libavformat/url.h" #include "libavformat/network.h" diff --git a/libavformat/westwood_audenc.c b/libavformat/westwood_audenc.c index b4fad83a17..597d68350f 100644 --- a/libavformat/westwood_audenc.c +++ b/libavformat/westwood_audenc.c @@ -28,8 +28,6 @@ * @see http://xhp.xwis.net/documents/aud3.txt */ -#include "libavutil/avassert.h" - #include "avformat.h" #include "avio_internal.h" #include "internal.h" diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c index a20cb15b01..a034407d14 100644 --- a/libavutil/avsscanf.c +++ b/libavutil/avsscanf.c @@ -29,7 +29,6 @@ #include "config.h" #include "common.h" -#include "avassert.h" #include "avstring.h" #include "bprint.h" diff --git a/libavutil/bprint.c b/libavutil/bprint.c index e12fb263fe..a6849d7178 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -22,7 +22,6 @@ #include #include #include -#include "avassert.h" #include "avstring.h" #include "bprint.h" #include "common.h" diff --git a/libavutil/mem.c b/libavutil/mem.c index 063635fb22..0969749077 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -37,7 +37,6 @@ #include #endif -#include "avassert.h" #include "avutil.h" #include "common.h" #include "dynarray.h" diff --git a/libavutil/tests/bprint.c b/libavutil/tests/bprint.c index 5a46f55d7a..d7f9abf23e 100644 --- a/libavutil/tests/bprint.c +++ b/libavutil/tests/bprint.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/bprint.c" #undef printf diff --git a/libavutil/tx_priv.h b/libavutil/tx_priv.h index ab44a1843c..63dc6bbe6d 100644 --- a/libavutil/tx_priv.h +++ b/libavutil/tx_priv.h @@ -22,7 +22,6 @@ #include "tx.h" #include "thread.h" #include "mem_internal.h" -#include "avassert.h" #include "attributes.h" #ifdef TX_FLOAT From patchwork Mon Jun 14 22:41:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28274 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247633iol; Mon, 14 Jun 2021 15:43:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLuAtylDJLBsEPon4140MwC524pir4upluYxPSfcc1LffbjYAToP1W20asB/uukVG74RCw X-Received: by 2002:a17:906:6d51:: with SMTP id a17mr17599995ejt.543.1623710631533; Mon, 14 Jun 2021 15:43:51 -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 j8si15315528ejk.224.2021.06.14.15.43.51; Mon, 14 Jun 2021 15:43:51 -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=qM4KvsCz; 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 65A8B689C38; Tue, 15 Jun 2021 01:42:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2058.outbound.protection.outlook.com [40.92.17.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 814AC689AF5 for ; Tue, 15 Jun 2021 01:42:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d3zfSWQl5ip1iO/kqIlDFe8s4WY7WET87aYMf0G2Gj198gsU9xFOkyHqVuDdW8hHEVG/8joOcudZCF9PAwtxO0BvsIbloATjAUqoucDDkoTzt0XwmDMsmxE4ANzgD9gv9uWSU1u2H7yFLgh8YogBvSnsD0CGNZ2gyTNazjXJ5rdAjzW14v0Y0qsyPge/AB4oB+1madbpn227PnJnwmh8jibsY16BeIdM8vlQ60JoUGvefC/ebopK8xKnxjJJGn0Qn/8eNCVnzzvkQmFN+Ox0udfTSSnhvlo2lY1FnJpWV1M9580vuQIX6c7Uriy/WuorcUAFfjZNyoA0HUEL3Zkxbw== 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=lraPuZxCiLoOyX+qHb5RTPS5fXp6pzTPNKOekPp6oqY=; b=VIwNwUXMMOLo5PkzhBuJ9nFMrA9921nO3OPvr7iYxjA0sK83DRwRppksFJ7FDdseNoW/Ui+GPqGCJv6sg64QtWjbCXcqb9Gdp+/fIl8GXJmf5bfPpUczL8xvzGnLAG/m3t8Y+8PsobDv6zX35wKTvZ+T1lKzu2xxxi6QVprbt5kIdTX8wx3rD1FCjBud5IA1/09FV2D7IJClursyDFdFZULBYvN7zr3zv8nm28mxKEaY5Kd/Wfy7IsdvETXKXGCQCnr+qNO1B6oP8E7TCb6Ulh1WBChfvnve1mjEQ6ptUxohfQ/O/vetvBgqvLXjXA1Ung+NSy04ewQCADdqGCgo4w== 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=lraPuZxCiLoOyX+qHb5RTPS5fXp6pzTPNKOekPp6oqY=; b=qM4KvsCz3MvNw/Pk303+7KUTXo9rKe8rORZ9WQ+0J/SKc6app/R/pK371MH/BZ9YLfi+aUYqWUkawI33vj5z5Q5niB+yRQKNJICvwxuo8kdwRpo4BOjOZOc9+GQV1e+t610TFOIEXCmnjNkqBolhAKyY/Jb7Lr8Pj0rxBeUROFo6KYc/aqVQttaErcC1ZGE42rtJiIXB8Be9smaXgjMl63S+yVThzu459YYL0SljnvNBjRYOcoEwwOXmfGvLWoMa+QwFft/kbqxrumUZVLErsFksMPq6MxZDk6KcojGc7143dPoxfGk8yKgBwloMCt9Kmz3vwfo2d1jTnm+jHErvwQ== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::40) by DB8EUR06HT107.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::405) 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:42:05 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:05 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1055ABC13A5FF892499B48369A2DC3B6EE75D9A4651478780FA6B6963D192B80; UpperCasedChecksum:8E8B7D2B21CDB44738EAF3C624569ADB37554E66D504B00AA692AEC2352C355B; SizeAsReceived:7600; Count:48 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:42:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:27 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [TsXimiU1PqTzZi+047gLsaUcXMsxqkMJ] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:05 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: be1eef1a-56de-4e2b-f4a9-08d92f85a27b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViQP5DY1gVUR1zMefR9ogQsUGOp37HAA3SSGK14qe5Gld/Br5V3ps6lPNsul8HiMaPhIW6reiVtrVfOpSaS9Hq/wKReyKgMDCvPw++MMO0SL7Va/YreNtnpvGfbZ08Fpjl+yUDaOjExZgspUGgZVtKxNh4JiaqIeQLe39WvzRWYPcpRoAk/C52rOmsUK6mbyqMFMU4spzzIOF+NurVbXUpeHU0k4bYFhyFpqXNXyS7eeCPEp0gL+5PYjKSTdZy3TMOWj0m4nNsi7aaOJh1VYJhTaJ6uWtIHRaOiuwFppW1zWShqnhSpDS84TDGzUPSAix3xo6WUOhZezCcMTDCRH8qlOPGad8Q+2eTJCKBmsgSE+NGFiD/sMpoS/S6Dqid1XqIPI3HXW4XEAtjoujTagKRXNROTHlgzw1Ho5RkpC/AgBKtCAPR5DtDyOztMHje2Mw2THBp8YGv3EFJoCvubyW5XrjFd2eNwoSEboirENJbC9xzuuCwT3GdayFYVnc3O0RoFFDPd2fa+dDbthCkrAIc2XdqC7orZ/Uu0q78WNpf89Ea8EFLDOs1Z4fXPEtX0L9eZHIjTYfIpvoDLE2OS33eDERwZVLVGsEUHv0CQVS7IiSSrxrNp/OUJ2fMuAQlBk2SX2tNZN8xLD9PZAdN6iNP7t69l85rM6mS5uQM8KMnfNUwOQC61hkC3Uu9XlKy0j1iPDHtnEfx/g9e9DALfbI0vILEDd63v3c= X-MS-TrafficTypeDiagnostic: DB8EUR06HT107: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 70UpTBKgBybeIX+cpEVP4voEX/ZacNTS3U2i9zZgV4Pw7OYRSougEQJhMkIC+1dY/htpqsto4NnzVkfpvfeEHPGMPA2pyDiWn7IgTAnuBTc4Rj6iZYvzsAAYOqLStnePFiiFktxINNrn0kMeXmbLYLgjuqdicPRtHqe/dhzyBlwDdnzSEZM24wIUs/WSODXGBltoz0jvuA1Qusuijnyh81JcGyI6lLPKd3y/eSlLI/mqFrgkwn0mWjDInvWG3xDknTkUggGfYayvfDLEsWpU45boFFwzCfsa8DFQTiGRqlSD/fd0BedShRVmjP3f20z8QLuCz8Mr0vdQjdcyE7n50zKOTzyxZQw1c4dzIXXrGbSRCbTZDmYxtlh3/FIWCcTBKDJPehgI7ydTh5G8KHIeqw== X-MS-Exchange-AntiSpam-MessageData: dQSpd3qqiL/4xqG9cRF3VmCIEl3n2wSjFnJM57yKhUbYdLfy/I42/X4NrQCcpG4Ga9Yscz7nKWuD7ZoQ6CHeB3G9kUdbjjDceGo3uVZD3SlXTqKF7oEDZZPWgv3yjC8MDVqFcfTcvyIHnnYYaXyClw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: be1eef1a-56de-4e2b-f4a9-08d92f85a27b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:05.4953 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT107 Subject: [FFmpeg-devel] [PATCH 11/17] avcodec: Remove some unnecessary mpegvideo.h inclusions 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: 89YBVN55xQrl Signed-off-by: Andreas Rheinhardt --- libavcodec/h263data.c | 2 +- libavcodec/h264_slice.c | 2 +- libavcodec/snowdec.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/h263data.c b/libavcodec/h263data.c index 20d0436fda..c520df3574 100644 --- a/libavcodec/h263data.c +++ b/libavcodec/h263data.c @@ -26,7 +26,7 @@ #include #include "h263data.h" -#include "mpegvideo.h" +#include "rl.h" /* intra MCBPC, mb_type = (intra), then (intraq) */ const uint8_t ff_h263_intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 }; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9c2301d7e0..20055e6f7a 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -29,6 +29,7 @@ #include "libavutil/display.h" #include "libavutil/imgutils.h" #include "libavutil/stereo3d.h" +#include "libavutil/timecode.h" #include "internal.h" #include "cabac.h" #include "cabac_functions.h" @@ -43,7 +44,6 @@ #include "golomb.h" #include "mathops.h" #include "mpegutils.h" -#include "mpegvideo.h" #include "rectangle.h" #include "thread.h" diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 7367176f07..1355ae6ed1 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -29,7 +29,6 @@ #include "rangecoder.h" #include "mathops.h" -#include "mpegvideo.h" #include "h263.h" static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, IDWTELEM * old_buffer, int plane_index, int add, int mb_y){ From patchwork Mon Jun 14 22:41:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28276 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247371iol; Mon, 14 Jun 2021 15:43:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMPcu1QoiIz5C75BNCpA/QoTZrhcnoAmj59mGx/5KH/Jz2UFX//I3xNHdtmlTmj+2zypMf X-Received: by 2002:a05:6402:1513:: with SMTP id f19mr20396550edw.235.1623710599221; Mon, 14 Jun 2021 15:43:19 -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 c6si13803743edf.406.2021.06.14.15.43.18; Mon, 14 Jun 2021 15:43:19 -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=jBOMFdDd; 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 1E211689B19; Tue, 15 Jun 2021 01:42:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2091.outbound.protection.outlook.com [40.92.51.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C670689AA6 for ; Tue, 15 Jun 2021 01:42:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MjuuM55MAr0+FJJ6sf0zkOtRqhSHMUHNsPdE//nyHWgDyP3IVub82KFXI8FbYL+oyxmsYdHK4gGR6eaINtSfXea9Vkgj6KFp3oYEGlol6qX0qSg8uCB9pPhZWDJQRYURU2P0NW6lbw2lEn2UjPNOvT3NPkVOucfd/mILq5IsYAfOSCTU3GjYks6VcYmIihWblTPKgCnRXWi9K4TXCrBRa77yUuBhdVB/MC0Qtq9dGnDSLmaJD8V7Deer2SizxWK/aWtj8I1+dRNC0QkShyzKrUfK79cXx4kNXCzeZuj18CtU9kxe9TBgAVj8eBhE+0W9eZ+H5aW+mPqBzk0VnDGUPQ== 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=7Jc9jcTImsEkqxqkTxq3L4/Ji365pNz5AP8fHaIWe6k=; b=oXnNzK8VDZIulAuY3+eLI1BjvbzL/p0vS4tPkvzjQvR5KBzlTawATz4FEcAWK4mJHP62yb3mvIweWP5PSJlhzrdC2pUxLkYqitATRThwU+/JqH7Lu4HokyNOTQqqY7+HyNNyIlCP3w1fe16qA8o6UXIFDxt97uJGsOCofUvJqGMsPTa/qWQcXHzVT/1a87GP+tvfEIoovjFXgDpEEnP9AckfbC8YrD0xe7pBk/7CXZKaqcmWLCTyaD5660KIOba8pKvDusInnvmNSirK+Y884irJd0XeDFaxVWi1yjSm8Oe08w8XFV+NyqftNUb3x7tOJFmGzPCO5M1Bf96khSZnog== 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=7Jc9jcTImsEkqxqkTxq3L4/Ji365pNz5AP8fHaIWe6k=; b=jBOMFdDdSV6ODuzZ0Q/m2PGHiubBbUDBzLmDNi2d4lwTItul8K3H4Gu3wkdBdc/452pQI5LrZzM2L4AGkNucCr9Ng6sgC2yq5buGBdXYiBi6Zjk3wSSLrz6P6BnBoQFs1+rSWV0p/beflqx/jshZV5E4e1jfK7OlpYleCUY4dTup0fCFTUA4tKwVtEahoZq+kerITDN2qtHhZHMh6purZg98tAzJoVPOQxTdHUJRf3d3Or0J1G047YYjq9UlH443ZpvBeC+b/H4aNdgW//hnZp8RBln5ZDZ0uO/y5+BrM1USKPq2adFWznwhT9aBq/QqxVRNHzjY04JyORB91RrxNw== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::49) by DB8EUR06HT077.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::341) 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:42:06 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:06 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6C7FA5D0EDC34922A3E034241ADF92D5DA6CF95116B449F9599A099A362759C9; UpperCasedChecksum:17B4C68ED0B2757BCFC3C80FDFDE814A4DD8E1D015C96B35605D9051FBB6C38D; SizeAsReceived:7588; Count:48 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:42:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:28 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Ww2pDxpZrVHrNG8JN8jFP6QDGGlbrIVX] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:06 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 6c7602f2-0889-452a-a093-08d92f85a31d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViQP5DY1gVUR1zMefR9ogQEyqUqEN0UIpsNJXzUHY3ehb1S/MrOVlYUTDlUdZVwXNIQ4m/xq9IgsWVPCg/XwFwz9ykswFipPZ0nOHllNx0liXIsmPMm/HkgYSJUlan6eFc2rKhFXKGL+MmdNy3C4xpnyVQo1fKKuEWJRsFQZyEtJqWs8hiPdaKIjKefajYTStZo5nYbO210UXVTQ+OQXj9i2BOA173VyRI8VHC7j7CoK0y5yL9D6zI2gALGwdTWe7dJXGpgaGJx00C/R8p/Fk2Cj6fbTUR6PJ/Kzs3nlYBGwrb7D9eUYoMnE7HdGiIebtWPUP+C+QuLqv3aMz46lmtWrFDs+k7D3PfWdUye4VfG4OhnFiURS1ADy6JqE9FVnB+mWQzU3w/6gnxS5LVK/knjKBP/ZeS9ZSziZXRu1IbOxkullGRsLsvWvQL5Ebw3iQ52d+4xLfdh9Xjvng9cPjOeNJMhDNCYkPqJ67aqM3LaJooFpAiBG3MSZttjD0cvpu4OXzk63ALobY/l6XjIOWPepm9akfdstvoaHziY4wlzrfhMDKoVBs5to+ruatGyUaunj9Wk5DcssgW3aKr1ACheiVsD4bkNWlkZeSkIb1Ve4D7lweMwsYIRVwT3i7GwD+IweONMGTnyO8miZ57MWals4R9n0U9l2BaZDkNxlF8KP72O5mxP83zkMMhON+v3JmpUDQF8yluM1WjagHrlU4WP+mQG4Sqz5k= X-MS-TrafficTypeDiagnostic: DB8EUR06HT077: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HvYUPlckjJOTwLT8BLHKy5a/1UKlfMC2hm5cnLDPym9Qe4kUI4XT3BMr9LtHZW6KvlTMematcTwONBpPjWINMyJdSMaNOp9o+QPvtPP5TurUmyHCjiQ/SjHKoWuI63zk1i9/hVnZzbfdx/Us9gfQ3/4zHhOn8CGRwTLGyZWIVpjkVBvJHv6q9PK/YDlSEFub7f4JSGuAqUICIXUjdGEQf6QChqRBcgzh3S597mWb/AqTS16L8PHB5A1SGymlZQ1F1WeVqJoUbLa/mA7yxbaQE6PCXYSWGfy4Ootg24ep2DJq6+CSWsyI10OMqZC/CTheVTTZNCIG55jbTP60NzxwIakbxEXoqqt+Aw3LtmFX11q3chqUkLZvVkWCpemCuxqLzzklcE0v8tWvr97IYt7ryg== X-MS-Exchange-AntiSpam-MessageData: INfrOf9n22DNAZY/OP0fPpy+ZvNpogHSI3muXdP6lYAJe/b6AJ1b0ZyEs8C328Xpolg3uaRRzusckEIOVebXN/IYyg7SkolaeNnBP3r9h1dEqnj3T3xs//d7DKKf6Q+KtX5qT8UKUVwgm3ynNvAi1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c7602f2-0889-452a-a093-08d92f85a31d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:06.5688 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT077 Subject: [FFmpeg-devel] [PATCH 12/17] Avoid calling functions repeatedly via FFMIN 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: 2yChW7iNJd9n Signed-off-by: Andreas Rheinhardt --- libavcodec/pngdec.c | 4 +++- libavformat/afc.c | 4 ++-- libavformat/avidec.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 16c4c3a283..3c00007907 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1044,7 +1044,9 @@ static void handle_p_frame_png(PNGDecContext *s, AVFrame *p) int i, j; uint8_t *pd = p->data[0]; uint8_t *pd_last = s->last_picture.f->data[0]; - int ls = FFMIN(av_image_get_linesize(p->format, s->width, 0), s->width * s->bpp); + int ls = av_image_get_linesize(p->format, s->width, 0); + + ls = FFMIN(ls, s->width * s->bpp); ff_thread_await_progress(&s->last_picture, INT_MAX, 0); for (j = 0; j < s->height; j++) { diff --git a/libavformat/afc.c b/libavformat/afc.c index a99f65472d..102b74baeb 100644 --- a/libavformat/afc.c +++ b/libavformat/afc.c @@ -57,10 +57,10 @@ static int afc_read_header(AVFormatContext *s) static int afc_read_packet(AVFormatContext *s, AVPacket *pkt) { AFCDemuxContext *c = s->priv_data; - int64_t size; + int64_t size = c->data_end - avio_tell(s->pb); int ret; - size = FFMIN(c->data_end - avio_tell(s->pb), 18 * 128); + size = FFMIN(size, 18 * 128); if (size <= 0) return AVERROR_EOF; diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 14a2dd6cd7..2e175b3179 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -363,7 +363,8 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end) uint16_t size = avio_rl16(s->pb); const char *name = NULL; char buffer[64] = { 0 }; - size = FFMIN(size, tag_end - avio_tell(s->pb)); + uint64_t remaining = tag_end - avio_tell(s->pb); + size = FFMIN(size, remaining); size -= avio_read(s->pb, buffer, FFMIN(size, sizeof(buffer) - 1)); switch (tag) { From patchwork Mon Jun 14 22:41:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28279 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247562iol; Mon, 14 Jun 2021 15:43:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMfhCiRpW1J9gp1BmE1+TyovXK7wx6WGnVfZoe37mET35r3TavYZPViCQRgwpZQuF2mfdK X-Received: by 2002:a17:906:840b:: with SMTP id n11mr17590850ejx.509.1623710622679; Mon, 14 Jun 2021 15:43:42 -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 j6si12281709edq.137.2021.06.14.15.43.42; Mon, 14 Jun 2021 15:43:42 -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=C7EV1jqR; 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 4FE70689C2B; Tue, 15 Jun 2021 01:42:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2048.outbound.protection.outlook.com [40.92.51.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66EDB689B0B for ; Tue, 15 Jun 2021 01:42:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nG6Zs0PI7HjqLBt/vtIeWlwGH7inX3dErDfuzk97JkKFpPt2gUlYkEMDGbf3UwAOgv3XfzxFzT0dpo8CQ7fjh5RbvaExvNKICmQ20dbIO3cICI9dFpHbrTp9E1LVN+fgtvzYsuQhtajARoqUNnnu0Pqdui9pGg5l75tEop1ps9fqNmdBwC6+rZ1aEdyINc1b2ZZNQTxH92VI1RJKSnfA6Q25QK33U0PLUCvirZaSQx2dfUN9uy2O6qe+i/AAA3o/HgZYZTR/mKP+eTZ56w/+HqQ4NDibLO3yt6V9GN8SoZRKnvZe2AIHlXyRSCWSx/dFER1vMSpgyvTn27Y4UidjNw== 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=KF/hpacmhMLsZnt6FHdkOZD1P6kDx9IbyAXxfIAjQ2g=; b=Ehq5omFHzgh/sV3DIxhE3FGMzchCp4HDsMZGeTh5FHTrRg9/9ZyBODJEdCaxOyjQwzY1jtQCd4Dv2emmL+xbBCSZAOXcIK9qOMURqGKZP+0L67FBVlL7C6+AmO9eE9rGlHHQeuNkKhyBYFrIxlaXi6mFYAfUjd/qHQAhXXiqgG/fEQg3nDL3VqNkdf3esg5TyZO+vgiaTeAxqgtlsPftgfY9qa833RWDgsvxQguFVNIztJdLIBM9K7pGNgzl/VzcAJT67ALas/9dGBCX+syFTZE0+m080g2TQhNNaKp2wu1qESkXJ1VosxwXeSp5RiK4WMznsWtwB5EBURXsks95RQ== 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=KF/hpacmhMLsZnt6FHdkOZD1P6kDx9IbyAXxfIAjQ2g=; b=C7EV1jqRG9eIurNwXSJ1hXNW4oEqXSyRD+F3y+9k8i5fqykc/cHaIJwCBkqtey4zWKcjQWyD1HzvYXRchIyL8CksVg6SGIS9qvg0eyjIEM8uwC3xQmpRwBX9bGYac3QELC/J/W2aI6VSq4dUFWF2+8B0v0H8AKibq8ACBn7rDelMaHcwU5FYf/D8yDQ8RjVRFxT1LXsIaV0bbBEvR6VNRmCDeSF9s4s3yGqolUpQ4lfJEIuSl7i5ASgckos1gG8Gm0xt7bzaFMgGpQh2wMlTolzueO4ufFkF8eddLgYEW0mJVM+PCXyx/haQRk8rxE15E6qhwsSwg44+sAyCt6vquA== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::40) by DB8EUR06HT056.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::340) 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:42:08 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:08 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8378335C33B4A905F509E8391AAF26059F94927068F5656FD54AB187CD4458F0; UpperCasedChecksum:090852EED135ADED07C834FBB5A066D45A936CFBC1A6645E0C0E8AB14D79643F; SizeAsReceived:7606; Count:48 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:42:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:29 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [tPVTQcAv7JA262LVipd/5TEp4bMsBBzd] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:07 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c7bcc073-1e27-4464-2889-08d92f85a3e1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS8u28ets82B/Gq5G20dnAwAsO49uX0sq0GMy184ABZxN3Ez/5JEvYwbKEjFKzQeqi2ycfJgJwRfxdXuoyS2LvRqKuDp/rHrVWuG1wmp6Z5HaYA8dYLHAh3lAK1qw/9XY219vCYFV2u+Aj6tTHyMIvXbpeoCg0iZ8vMWROIZ74Dnz+y3Lp8eI4DSBoznEBq7368syG+RYLa1XYZUyUQwsWHHScHVcRtyODClbDpWzs+6wJNIhkRDMwyU+dlsV7Aulazb0+4t+g4XR/Dn+dn264cBhxEKqPrfq6JRRUvKuiLEMQ+FW9CZpSiQiCR0ANgXSn240+1SCZBgi8WxxHOvaSsskJZXdrulqziVTUpqONfYXz8yOE1EMbqJjpAmMCyobsAaczAX1PfJgEEoUiG+e9Cw5CBmXKnN6ouNMMkNPE20jSWH0KID7WoHAGJ7FZ/41bH35dl2n8DGJKwP91oETwRVyBY31yxH1dGIgLBcwJpWLTL6EDnSx5SO7Int0WypHsvEdlZGjmMIQb7dcGsWjIFamnTX3tGrMYTJ8cf3cRHhEmQdoKNIBL7eQZCRxlvx0+1dBLqrVGlKTFH96L4VGCkEatTCu3nwzhB/fKytTyoOcSqXBvb3Q0e3dVzL7lGkSixeC/tyiWiYF+qAKKDgORih8xJVVIOuspjZZw2Wd3XgHa6GD+Zgd5axWDaEaZPaM8bI52CUlDHMNV6mNPR4NkyPrDnBk2XqtuXbu/tD//GneZFaM+GA/L4HXyOTE6gXMQ= X-MS-TrafficTypeDiagnostic: DB8EUR06HT056: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8s2czyhbnHbFN9nXzDKsR3RxkM02RSf2podeE9UfFXtx9TnmdTQEas0ixTV0AgqXtxY/ktW4bN/5VWNiTGpQNfUKPDHXVRJNHy8CcrECJC1ZHpxgq6kRIMaaLy6MIQzWrvDst7UI4iJxPEQ3Z9+qV8GywRhxPUVIbrJnUd3xhPiMcV59AU71xvh2Z07DZfxkeFmkEgAvTODeN6bdzmP7+eq0E+jYY/W2Y6CDtwJZdpWVibm2CQdcUtxnHi2gdGfgd60xloeSYf5p/RU6v2hwN7C6et25VWWF8VWywlkThpc8lzzm/OiNYI2uJe+cW6RnvlcVi/FGdE4tq3ZZvZxe3HJPYByiDb/PIsTKUSqN7XYTI05VuxW4C/z7ct3Lt9aJGDu8S/jall8eNNFPylLHOQ== X-MS-Exchange-AntiSpam-MessageData: xh3NhlY0Qv4tqdrFSBIViSG3hiRyz40USpfFlI+oYtl9Ts5XMlGoIax5uEf5Mbt1uOPqdC8cAA6TfdJWSgQ4T9GN9LCqEQsC7+XTxvrevd0whO4Hk/kqL4+VWw7kd/B0kTCJwXx1okzpAtVurA23lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7bcc073-1e27-4464-2889-08d92f85a3e1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:07.8612 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT056 Subject: [FFmpeg-devel] [PATCH 13/17] avfilter/internal: Mark ff_filter_get_nb_threads() as av_pure 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: UUXHQHBm/yLw It does not modify anything; it only returns a value, so it fulfills the requirements for av_pure. The deeper rationale behind this change is that this function is called quite often inside arguments to FFMIN which may lead to two calls to it; declaring this function as av_pure allows the compiler to optimize the second call away. Signed-off-by: Andreas Rheinhardt --- libavfilter/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/internal.h b/libavfilter/internal.h index f3b434dbe9..1bcfb830a1 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -363,7 +363,7 @@ static inline int ff_norm_qscale(int qscale, int type) * Get number of threads for current filter instance. * This number is always same or less than graph->nb_threads. */ -int ff_filter_get_nb_threads(AVFilterContext *ctx); +int ff_filter_get_nb_threads(AVFilterContext *ctx) av_pure; /** * Generic processing of user supplied commands that are set From patchwork Mon Jun 14 22:41:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28282 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247729iol; Mon, 14 Jun 2021 15:44:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyCOyFR6uf+rdLxntf/zs9VZLYc9CzjuJw0rVxMUcYHnIztNg5j+zdyhmitjum6rz8yOcU X-Received: by 2002:a05:6402:3594:: with SMTP id y20mr2159024edc.299.1623710641463; Mon, 14 Jun 2021 15:44:01 -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 k4si12509060edv.523.2021.06.14.15.44.00; Mon, 14 Jun 2021 15:44:01 -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=cAAa9DOl; 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 4B853689C7E; Tue, 15 Jun 2021 01:42:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2062.outbound.protection.outlook.com [40.92.17.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D079B689B19 for ; Tue, 15 Jun 2021 01:42:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AW3W/0zXRxd5xEyDRn3ud1YVzA5K7+Ay9pv7unqyXgbaVDSgW9svf6S+O9JnlXPbWms2Fnj2SKLe2YkN1NAzH4V13OAARsOxPhyoZP6UXWopDEkxm6/g1jkX8onQ04fZGnIa8IeX8ltoa1Ak9S24K/n3TmfnZqxjLUe0alrldVJP5/xJIU8sNtgkSboXxkgVLAh/EUeiT9FHNDA4bjKBslqyd5sVdh148BcaIPKsj6ZF0EUYjzummu2EMWZx11SWdv0PRSZ5GxjGoWk7VrlRgl1tqqmc6rteMCe+KRrskoCPO5w5LrpmYvDk0rk2C2XerF8K3ttJ/SpunP2eclWvqg== 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=nS0GKSZKS1s/9Eppmmxc8m5CZyrED6js10HJo1TfTWE=; b=E/bi8/W6JM1nRNJ4NZcx/ILlQeSpqJeXTw4NmM9FjngvU7lFVnceioqn8BBybDuwMsmDVzgEjFez7g16eZH0wLxjcl7KRFFDjKLAD4uHDtoU707NOOwBQbq3zLhiw3U0NV1TmPvP1WOFuDMq03OZmGfydlpgslBU28pcEbJYyYBTvBRvaPdjNtLR+W7pWPJTnrSO4JUc/KVZJsaBffPrwq+Ph+fiJ86Jq7PAL/8w2BXs172Am1L8ydV4YuJEZdq2VXJQtOL2pi3Oz6wYYWuD4Yn5o5RcpCPYco7F9Oo6F18oDoxjq6g+EAU47wISRKQxKmC2eMnRML61yfNeuh+JGA== 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=nS0GKSZKS1s/9Eppmmxc8m5CZyrED6js10HJo1TfTWE=; b=cAAa9DOlyDzmz4P6uyv5BKUgu3IH64ibUW2htkBBHalc3+JvvccPYtgOQXqqNgh/JTk/8T6yWm5p8JIw6vdR5xwnt+ogq+HRNjl0FLcpaUrYlG5IAwdKL7ipAo4R238f0Pip3VEviP7yetZOFZocNAcQKfMdyaoUJjF67L/Lws3klc+239e0qxNsHmVeu0s8Y7P5yMVgLFFPSb+2vn3Gjv4iG7RN6Awk8y5m7ixGUtf9giWtaxsXJep1W5OgnkLfLrVmUaZw9APJXTFx+QHWzZpJKbEpHYuIHEyxx3gkr1MMQdAPN/dvJUIcTyPXCPIDS/ffPD9I74ceyGySbm2Pbg== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::40) by DB8EUR06HT107.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::405) 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:42:09 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2A3D50B16F535098736E4536F7A2D6BD0DFB6873C6C832CC27F95EBFD6F66CED; UpperCasedChecksum:E0A9FC258288965ADB3253BFC2580DE08BEB3AB967732394FEE18A18344DBC60; SizeAsReceived:7590; Count:48 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:42:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:30 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [dP82GDn/DruvgAo1w/FcY/Kj0Bvc68mQ] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:09 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b617f9f8-1c04-4d69-e2c8-08d92f85a4d4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS8u28ets82B/Gq5G20dnAw0nLmfMpfb94gUEHTimxlKdU8Bdx9+PEZBeflXrh5szKzbm/2jlWI0VOV/YiYBQ1G/JLLnfp+vkk/HngHMlRZ8nI0HZ/PysPhv5oEzOaEQLKRNBuyPOSeETx+tOlDeX6XCGtY1kWGLzj38pdUS7Vhn4Z6C3WG6dy2AFFZh78nEE/SVT/Ta+XGbN0LayRy8To+SlFXrhYlxZ03YFUAu/b+8htGMKNmbezhwCTZ82rpnK4n9PIM1sR7WzcIwvQzRR05zCGDwqfTTzdMX6saMPaBSRL1RmXXpv1NhKgYqs5hCeB1SowgLAn1dEIgeiL3GFnhkRwRpCz2IaJwgRT2Zvw9rggEEw2tZqy9BVB4ULqECw1HpUIk/DwyTYkByjL8WQdKvuTeeWFnyyaY3h61bddy7sUFBDq/RRYWf6AxFB1aeAE8dY2JZf3HoDmV2QxKZ/sQDfdIrwUBolDl9eGAdhCg9mDaRFir3f3sN1JISBBM4NNAZtM3PFMv3DuMEI120c1wD2wSx9SGZFyA/G8evFweDIKFlBfXB8NXq/wXP/PrUmpm8ws2nzU6k90NHWHfaYX1jJjzVJV1aFISSbBsBWmmL4Ajpvl9GYX5t2PMXuPcOxmqTH6sLq3elvbr0grB2H2k5OZB3Cpa9KBDxxRF+fLbrpyunukNJ6XN2/S5/5266QlVPgZmiRDdem0nF6mmmF019KjH0NSamtaRZk/vravCvBB+nPK0+AnRMLxFck7N0fI= X-MS-TrafficTypeDiagnostic: DB8EUR06HT107: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MywENC8x0r80/Be4H3vtrI83Ur57nxctDRPYHl1Rt4RZ4pGAv2SmNSXHaNMIuNmXZGPoA43g2znmwCySol38L1qrLL02Mf0GygVDPc7nr2mPuh2lsUjeadY8MMIGxJwyc1UAjynI+m7vXJ2ssZ3OeFUXpVPwF893/NRG+YJd8YdRlfQuWLrraGaKqEKbDERRf4w6aynFWOTrCnuOtM7ShCD6ePQwS1z8lU/RtAYY0qt+ktGB7VvXhRQ/3dY0739wRkLso6v1EBQiF/ToaUtfz33z+25QrEJ89hHWaXsDpB2bOhvuePwZoXSJ+nyRVI7Coo4ErMR+ae8/TLH2G++Thm/70cUualMyrXb/DNMkflGqvHdq2/652ckTsJZ4uMVCM8cvCClXZSFVJsLEM4w1Vg== X-MS-Exchange-AntiSpam-MessageData: 7ZQK7gb5Lnf9xV7sJrYDRVWFchfhAhUYfMCu0zRiiU2aU8e4dodDIOlgyRZ5QE1sbcVNvEICNM4al7CKH+lziGUZ+Dqb5lzNmyJtIXpSt5FlTk1rHfBTF1NHYk/rmFVNRLSxleDSIrHnF3E91sughA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b617f9f8-1c04-4d69-e2c8-08d92f85a4d4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:09.4425 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT107 Subject: [FFmpeg-devel] [PATCH 14/17] avcodec/dsd_tablegen: Merge header into dsd.c 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: EuqT62s8Wein Since b492fbcc6e87094804fdf71308dc500976c6b165, the DSD tables are always initialized at runtime, so merge the dsd_tablegen.h header into dsd.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/dsd.c | 44 ++++++++++++++++++++++- libavcodec/dsd_tablegen.h | 75 --------------------------------------- 2 files changed, 43 insertions(+), 76 deletions(-) delete mode 100644 libavcodec/dsd_tablegen.h diff --git a/libavcodec/dsd.c b/libavcodec/dsd.c index 95aab61ea4..c18e20436a 100644 --- a/libavcodec/dsd.c +++ b/libavcodec/dsd.c @@ -25,9 +25,51 @@ #include "libavcodec/internal.h" #include "libavcodec/mathops.h" #include "avcodec.h" -#include "dsd_tablegen.h" #include "dsd.h" +#define CTABLES ((HTAPS + 7) / 8) /** number of "8 MACs" lookup tables */ + +/* + * Properties of this 96-tap lowpass filter when applied on a signal + * with sampling rate of 44100*64 Hz: + * + * () has a delay of 17 microseconds. + * + * () flat response up to 48 kHz + * + * () if you downsample afterwards by a factor of 8, the + * spectrum below 70 kHz is practically alias-free. + * + * () stopband rejection is about 160 dB + * + * The coefficient tables ("ctables") take only 6 Kibi Bytes and + * should fit into a modern processor's fast cache. + */ + +/** + * The 2nd half (48 coeffs) of a 96-tap symmetric lowpass filter + */ +static const double htaps[HTAPS] = { + 0.09950731974056658, 0.09562845727714668, 0.08819647126516944, + 0.07782552527068175, 0.06534876523171299, 0.05172629311427257, + 0.0379429484910187, 0.02490921351762261, 0.0133774746265897, + 0.003883043418804416, -0.003284703416210726, -0.008080250212687497, + -0.01067241812471033, -0.01139427235000863, -0.0106813877974587, + -0.009007905078766049, -0.006828859761015335, -0.004535184322001496, + -0.002425035959059578, -0.0006922187080790708, 0.0005700762133516592, + 0.001353838005269448, 0.001713709169690937, 0.001742046839472948, + 0.001545601648013235, 0.001226696225277855, 0.0008704322683580222, + 0.0005381636200535649, 0.000266446345425276, 7.002968738383528e-05, + -5.279407053811266e-05, -0.0001140625650874684, -0.0001304796361231895, + -0.0001189970287491285, -9.396247155265073e-05, -6.577634378272832e-05, + -4.07492895872535e-05, -2.17407957554587e-05, -9.163058931391722e-06, + -2.017460145032201e-06, 1.249721855219005e-06, 2.166655190537392e-06, + 1.930520892991082e-06, 1.319400334374195e-06, 7.410039764949091e-07, + 3.423230509967409e-07, 1.244182214744588e-07, 3.130441005359396e-08 +}; + +static float ctables[CTABLES][256]; + static av_cold void dsd_ctables_tableinit(void) { int t, e, m, sign; diff --git a/libavcodec/dsd_tablegen.h b/libavcodec/dsd_tablegen.h deleted file mode 100644 index e5da86a1dc..0000000000 --- a/libavcodec/dsd_tablegen.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Header file for hardcoded DSD tables - * based on BSD licensed dsd2pcm by Sebastian Gesemann - * Copyright (c) 2009, 2011 Sebastian Gesemann. All rights reserved. - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_DSD_TABLEGEN_H -#define AVCODEC_DSD_TABLEGEN_H - -#include -#include "libavutil/attributes.h" -#include "dsd.h" - -#define HTAPS 48 /** number of FIR constants */ -#define CTABLES ((HTAPS + 7) / 8) /** number of "8 MACs" lookup tables */ - -#include "libavutil/common.h" - -/* - * Properties of this 96-tap lowpass filter when applied on a signal - * with sampling rate of 44100*64 Hz: - * - * () has a delay of 17 microseconds. - * - * () flat response up to 48 kHz - * - * () if you downsample afterwards by a factor of 8, the - * spectrum below 70 kHz is practically alias-free. - * - * () stopband rejection is about 160 dB - * - * The coefficient tables ("ctables") take only 6 Kibi Bytes and - * should fit into a modern processor's fast cache. - */ - -/** - * The 2nd half (48 coeffs) of a 96-tap symmetric lowpass filter - */ -static const double htaps[HTAPS] = { - 0.09950731974056658, 0.09562845727714668, 0.08819647126516944, - 0.07782552527068175, 0.06534876523171299, 0.05172629311427257, - 0.0379429484910187, 0.02490921351762261, 0.0133774746265897, - 0.003883043418804416, -0.003284703416210726, -0.008080250212687497, - -0.01067241812471033, -0.01139427235000863, -0.0106813877974587, - -0.009007905078766049, -0.006828859761015335, -0.004535184322001496, - -0.002425035959059578, -0.0006922187080790708, 0.0005700762133516592, - 0.001353838005269448, 0.001713709169690937, 0.001742046839472948, - 0.001545601648013235, 0.001226696225277855, 0.0008704322683580222, - 0.0005381636200535649, 0.000266446345425276, 7.002968738383528e-05, - -5.279407053811266e-05, -0.0001140625650874684, -0.0001304796361231895, - -0.0001189970287491285, -9.396247155265073e-05, -6.577634378272832e-05, - -4.07492895872535e-05, -2.17407957554587e-05, -9.163058931391722e-06, - -2.017460145032201e-06, 1.249721855219005e-06, 2.166655190537392e-06, - 1.930520892991082e-06, 1.319400334374195e-06, 7.410039764949091e-07, - 3.423230509967409e-07, 1.244182214744588e-07, 3.130441005359396e-08 -}; - -static float ctables[CTABLES][256]; -#endif /* AVCODEC_DSD_TABLEGEN_H */ From patchwork Mon Jun 14 22:41:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28281 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247805iol; Mon, 14 Jun 2021 15:44:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCiZ65QQNMy8sTJrBV56quVXfRlFST4+1ZoxB6rPyCl8OhNTHrYO2TNUAjGuczrqtVEWYY X-Received: by 2002:a17:906:29c8:: with SMTP id y8mr17401162eje.312.1623710650534; Mon, 14 Jun 2021 15:44:10 -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 i19si13586613edb.180.2021.06.14.15.44.09; Mon, 14 Jun 2021 15:44:10 -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=t0xUKesV; 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 28BDB689CDF; Tue, 15 Jun 2021 01:42:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2019.outbound.protection.outlook.com [40.92.17.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E242A689BDB for ; Tue, 15 Jun 2021 01:42:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XgtO50ZD3tP8GzGMUXsYn3zEb9ZwfPYoFRxf93TzBdkqsMW9P32Vtk4gUfDnfY4hz2d41FemZjM4qIQcMmVjyITb+xNhEA1tWVMIo+FJMP9Of2kk4tuMIhjo8X7+IY8f0APkerTb8KGJ+hD7FXZQLHo+hAErnUqktARMo5LHrTBUalYbj+YE2iACWev3Ds9WdzNzFoI6bw7qfM8in95VZ3y2pQ34fRUcAlK+ts31v7VAFCCwFU2VlNcMrNGHw6U7OiltGo0WZO6HPZD8tvqil48iPZX363JOQ2Y1893jeCaaYp1Pzu2FidburhiLUh7acplPWla2BcN5aB+I/sT1qQ== 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=Hl0LNqrWQ95zR5FvKK38axW5Zx9Wev2HndBOheLe1Bc=; b=LRzaP7/JGXxc7szeI/gqjNQOWzkUrBTUKEzms7tzRSCbTUk/EEPGdMDI3uEsPAfpC8/VF12CRG1lb6EwUnB9sVTJyGcjimaV8jb3J37qUAH/QrDudHIe1p+/tTjI0zhivlKZzEb8dOGeGJvV1VXimqgCfDU25yKdw8jPp+G6lVyg5M1UuqnPEw0+Wya461XE8rcQNUQDlKUPHrxha0dIg7LOOJWPc9BEX1VY6uYkiNNZMs0LS5Q5VzXNLrxkoUeWwS75gLgw3hNUI6npgGE01cmVVV/gRntHoURXClixOTfaMdsjwLQA6VMBUOKJVnGaP4zgfP3vvyLVpTaCsncFRg== 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=Hl0LNqrWQ95zR5FvKK38axW5Zx9Wev2HndBOheLe1Bc=; b=t0xUKesVlCKbd9LytD7Wkl7NvTFVwyyOuikZToMG89tS48sO6eaYMR1TI+nfeIg+10yi3s/4IPyOlvwaCDSobgpavjR/xirrOq5TE/aJZgEd+atmlM94nMn4lzdQJz/pKTRjWkDswUT2j/4gHryp79YqywmcvbXNEVQ6PdGRkoiYTMbiu0DA5F/0SQriRRyi6syVVFugTTA8JO++NTeZAGh/GijtVsjx80EvooIsvshGjEPsSplUDT+mxNNftt+YdEiYszf5QQm9Z7hw5HmhjbPh27SBNIhz1uwRhNbEN2kUKWsL3Y6t2C2Zwm/nYj45jyrEnJ6+NX2y5cNdBxT03g== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::40) by DB8EUR06HT151.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::124) 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:42:10 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:10 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C78C8D79E59ED47D94B126F742FECD770A3CA24C78D30E507D45ECA2DFC9824E; UpperCasedChecksum:C8E0627D7798888431A76E4ECEEFDB98A8DA540975CF675FCFBAFD29E9A7DCDC; SizeAsReceived:7598; Count:48 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:42:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:31 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [bRf/0reDibdVR9EAzuJ05OaHIe5iv6fC] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:10 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 6b5e3578-d87c-4a28-4918-08d92f85a57b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViQP5DY1gVUR1zMefR9ogQ2j6QiddYV14L/FPEEGdFByYLMOriNF/DLu1pIGzlEYPHnpGDHive98eWvyhLUGUKZrKxXXSioMRdqclGuuMVeIEhsEvQv1pDsdvFEiJEmajWNlnTzzVD5kOPRWKO80Iy1qa+eqrwtnwqzuejposYDFLt2+C4uLtx2I9RkrUKBGf5v0ToyL+9XeKVzOuFu6zdYOH9Z1eRLF2Is5F7dheCMYRF50xLpF+rcYB5uVnEtvA03OrZWkrZx4s5QGmXqZleMCrfnshL957v8KqU11FRqm1Z9Svgx5eymHr3qduqds9f8ct8b+uMF800haULJErwH5bdjUInn8bFku16rpV3IGipE1LDLche4KafeboHa91V2uqwAAF9FgipImZvsA9LoC2K/TElf/kJzrZMhkFUb4VcLztZYOCSsAYOcW8vFS1hBhz8V/7CFj0qYzYHzEYmo7pnuACrDk25+AtPlHv1kCbFeJEtoG1f91HgWdTknPhMGDqFURIvV+9lmGSvcAb+yEm/ca6N1L/kZqzLHAWfZlXXgTALhgWPL7rfc+dxghyrB65DHrfvMBeWNY/RStYLqXzCNw+PEPfVr5qvgIttBZeuYjdyU/8FaAAdamZQAFgwOXXqxsNgv6mw/nbgtcLkafxj5HExrt6Kb3R9jMPnuyX+XnBe2uYHLJaZA9Ctwg5nmSrlFlkz7vcwYukGn6mKwvfDwO8so6Y= X-MS-TrafficTypeDiagnostic: DB8EUR06HT151: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qoY5iRiKfTdd+FY2OgO0h5NsJ9wbVFhHdUPZvwtYrOyMGT5utULM0rW/9iSKM9CVI45MWAZitveDe5yL6rN9U3P9J6TPhDA3FM+nH37ikBszRmOuTYYinla1rYgvzYzuq4XQL0Dbc4XBbE66UqxNowBnkM5Hc9JhRNPoczOcFwWZPCSO/FdqhwzUOCI/JqSsHUncWaZicgShBNCNCRK6Y7t6J8RYJB57MPS4Glh0wtpkFX6EutzDbjhhJ0/bWltoBGGBiXPaC/5F/q/G0gQMckgpvr8R+DfDLzzlfYUGUupyA6NY3VLKvs46at2gjC+VXkUQsUbyPxAk5RwAM8vfiKiAwKJGWXen0+5a2NXIJ5R4ym3YgzJxNaIsUlpbqDxTemYftbK9jPMenlmF9NZu0Q== X-MS-Exchange-AntiSpam-MessageData: OLZ6/iCY3Uf7Cfd6C5wV1/hKn3EaXaYPt/VdDEAx+Sn6eK1q1Rsy+Wnfpiul7sJeYhA45A9Dv/7Vc7MP+3dUkmkxmDFrHSRvJaihAhFhkrgdU/TfHqNmj+M20/ozZVEDf8fFWeILR4CbLB+Nl5DbcQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b5e3578-d87c-4a28-4918-08d92f85a57b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:10.5660 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT151 Subject: [FFmpeg-devel] [PATCH 15/17] avcodec/g729postfilter.h: Include acelp_pitch_delay.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: Tvw8JDXsB1+K Needed for PITCH_DELAY_MAX. Signed-off-by: Andreas Rheinhardt --- fate-checkheaders doesn't catch this, because it doesn't use the RES_PREV_DATA_SIZE macro at all. libavcodec/g729postfilter.c | 1 - libavcodec/g729postfilter.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/g729postfilter.c b/libavcodec/g729postfilter.c index 617744ec8e..125a4095f8 100644 --- a/libavcodec/g729postfilter.c +++ b/libavcodec/g729postfilter.c @@ -23,7 +23,6 @@ #include "avcodec.h" #include "g729.h" -#include "acelp_pitch_delay.h" #include "g729postfilter.h" #include "celp_math.h" #include "acelp_filters.h" diff --git a/libavcodec/g729postfilter.h b/libavcodec/g729postfilter.h index 5c2aaf235b..69815341ed 100644 --- a/libavcodec/g729postfilter.h +++ b/libavcodec/g729postfilter.h @@ -22,6 +22,7 @@ #define AVCODEC_G729POSTFILTER_H #include +#include "acelp_pitch_delay.h" #include "audiodsp.h" /** From patchwork Mon Jun 14 22:41:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28295 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp3250203ybk; Mon, 14 Jun 2021 15:44:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIQekWC28JvP458brgOeKR1lVIYjMM2yNAJPIgXSA/f2aIetoXfFBAeLCfGSUdIA5Lp3gb X-Received: by 2002:aa7:ce05:: with SMTP id d5mr19293691edv.325.1623710660787; Mon, 14 Jun 2021 15:44:20 -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 v13si14805222edl.474.2021.06.14.15.44.20; Mon, 14 Jun 2021 15:44:20 -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=tsYKLlgT; 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 68875689CFC; Tue, 15 Jun 2021 01:42:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2025.outbound.protection.outlook.com [40.92.17.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A1216897E8 for ; Tue, 15 Jun 2021 01:42:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LG2CcgGNNdVG5utupzD/EDk5Ssfrbk2Etu3Pc19Z24xifAP4ANvnzMNfxrcS2gKOyFRMhj3lPorxvw3CH+Nu1jtvJuGkBEzFaQ7SI7nkz1MAVG1CPutJuYp24rdWOxEDk7XW0pGNdpJ+qOTcwub10eBb/S89Xjahpg6CQYx/oRFW5jjq11vkQXVEeFlsrtSCJ5uY/oM/7vxypTmQ7g2a9LXnBj7FI7IJks13YKitWir4F8rmnZ+U0mkZ+9wr0cSbp3fulyZBjA55+PrcvlxxxPa3J8gJewgVj9+sICkGOsiPogqVb1eRuhUV+Vsry6ELWplY9tDQolPVyd/XZMLgUw== 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=ybXoCw8PxmlewVakiXvi34rPVW/nBYl0NarhSG93lTc=; b=TsmNbx6xe3qjrL7tAdlQ4KVvK2cD8WeGnjOKcZRoBJlxOhCrwvZhp7AzXfPuMrvCbu8fB/nDZJXXGGrA17gzyR8dyneEUDwJVrI4UJsSrbCS078pSUl0o/UvfxuJGNGPJSy9vKVuxBcRAeIB+pMEHEvTJKsvEicT33metfNRA+bVe8N5ziWQ9rUhHN3PnZmbcwqBRD4lKrBDfKoxXCAwQqK0sttAZvUtDAtGajF83s3IArN9z9HDMtETHg4CaUe79TJi/I/leTlI4DxNDMMNTrGFrVXU3KeKqtw3DLDiDFwIxIDsZvQSMn29ucXY//dEBi+I9T37baZkkcCdYcNrIQ== 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=ybXoCw8PxmlewVakiXvi34rPVW/nBYl0NarhSG93lTc=; b=tsYKLlgT/+CpHO+2jiAfsWq3tpb5ATDTX5F8dIBMW9GH6TirEFLpPBZO1BrcDjRg6NLyfMUcOTzVl51V6fj3c7V3yqb4B72e1fFvmnYWXAykK2uBgwZQ/epHgA3vB7zbkjHMqLRZ8sIn7aNgEWTnFu05FgNY2OX4jFps+qptA7l+47j3a8i7YPNtjsp9GOjQizm2Ta5T4EhGyeQRoZrTA5rk5+2cuHJJtugrNM6WoGvNg4ee3P3bQIHxuhB6G2ymSQ4g2zD/zosqHP8Bhzyx/pvgQ6+kSLPQSL1aLndPYzx8jY/FlQgqvJX1J8I/wBoatAwYTjqiQlJjmUSrLYHBXw== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::45) by DB8EUR06HT016.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::388) 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:42:12 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:12 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:28517C15F2B6F0629C71495C9C2213D46CEF2D63165E72703C5E70F6D8A621FA; UpperCasedChecksum:798370E33E4215B85B21774A82F5F3F6222BFF0DDA9965290AEE34D8A04F28AE; SizeAsReceived:7598; Count:48 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:42:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:32 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [SXQlRJpGy1t6OAFisNxIrxexT3Fa2dK4] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:11 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e5aa680f-ee36-4177-677d-08d92f85a665 X-MS-Exchange-SLBlob-MailProps: LhCMoOy5Bnkevv7UahNfEzEcY7AIsuTvIv5dzLrEWBzv1O1QJGYsxxruiezJ1+/0kHUo5vYmxP5ZgkSWLrcKvcAUw0q9g7ZcCOBqjQzBi1RNWExWTOpfAFCLZke1G8zJQC4Lz0ZoEpkqcfBULDgT8xgAajsDmVxS9qjW9a4xLZOEPYCu+ALelw5kchjzkGcuCm+VNBYTevP58a98iJwFojzA+tqrJcl+kCPLGqAyQ97jtrXhj8p3+hp8Z9sM21/MpOhd1vSZdkH5Uf2k2bhywNPH2BqEFPfAfy0L5VYdmCqpc54s6V+eynwNr+cXpK+GoZJAhNnDaUJXpHwzK+OSG/q/A2NCL9yC+s9hkWtKzadFw6lziKI+9rrzaO+Zi17uYh4YNNx98dHhDoalONhm5PGuk5RGhT6JYpH0xvhMlE1KRz55XrEKdMbnnnZ24NlWxG1Pj1iRIm/8CC5q0Y//mvSxpl5AXS/J8MHarN9zoBz1BE5OxhbH4HLVhf7gs+FtDt42bDBeY94rZD5MMcvo/skkeFl1B4PRflm87LT/bHuMMFAi/u3ULJFXOQpddIdRwFvMcmmwS9930TdN2ZCY4VZeuPfuTMfiya8g+M5qs8JluagQDZYqbcslRZDM88d7EnJE0Ig8b97Bkv7MEm5ZH4/9WQRQkuQ2MfafuZqr4mMyjf/AVlPy3iK/qzBbwuDwqxNZhPJ9LVC+TQ8vP9PVd3th0dAHpDrs3IasyfbFc5p//jxKE60bVc6dfVhZ17udVgOSV0lfjtrKnAXj/TCsgar6VO8JwM+1eUag8kdOTapNzeljsu+mSaXKsa65CfPjDktJgQaphACn1sJc8o7La6akCrvlsTOrULm1+/qXT/gENRh2zkG33uJGsHjM7Z79fWLqt5WKEd3UidSJKeEhiW9ISHxwm9MyaJ5zee2Py6t8/jXYguANAlZ/GSPIaJlWAHKNj+ooz4kat4dKlAAAw6+hLClzlbKFa4mnuftiK85YUf9enEShWULqEVDObqkuh5wjhF7DiCyqhi75Ry/Lpw== X-MS-TrafficTypeDiagnostic: DB8EUR06HT016: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l6gKrQgq+4XTKxllHrQRhZlaPc3zQKVmkQL63K+hFizwx6GEU7v3hCl2/X4adJe07Tjtsmrp9lN+sDJdYwLZxO0tAL0DgNevujDbn4THF7eT1cUqNP12yjxitwkgzwzosDJMpRN7duxKio7RVDKXIY7mT78DBGpgKNOr4k2ns8eluldUuxUomuxClhZjaNQijz6VYqRA6c9sybVArotgzfrU+W7+AKixw8dorjm7uK9d4XSiHheyUnwhI/Dwpn6QOfeZ9vebQdULva9cb58sTHirmnPtIVHt/xWLqyEwByAs7h09SnVZ1O0Ln9e9SNmCOG/usyFkveAumTddqHJzEK1+SoiuBm5GWThAjHOXe68uZqK5EUWmNzwFwSj1+lW4dVuvKCDpJ5In33UWFeYOruwMnHWAGza8sa+wpGXChwuIpiWSvwE/ZezkIF9w0U02LwDIP/SWq1QCL2AP3q7heA== X-MS-Exchange-AntiSpam-MessageData: HhZbXiNpPCXO0IpX8mpdMuX4IG5+B+9pzzIlZSRxBDdbur50H4Qlnq0GX6by+3Q+S0BLxWgHQ+yCK/4Q/XCdd18MIsM/VQkxtQKyZs7+ZDkiTFlLysUTfFEZ7j/zGI3XPiVcGYKGY6/lFQbxfwuFnw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5aa680f-ee36-4177-677d-08d92f85a665 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:12.2433 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT016 Subject: [FFmpeg-devel] [PATCH 16/17] Remove/replace some unnecessary avcodec.h inclusions 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: Ar9XaM5WOB0v Content-Length: 45941 Also remove other unnecessary headers and include headers directly while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3.c | 1 - libavcodec/ac3.h | 5 +++-- libavcodec/ac3dsp.c | 9 ++++++++- libavcodec/ac3enc.h | 1 + libavcodec/ac3tab.c | 3 +-- libavcodec/acelp_filters.c | 4 +++- libavcodec/allcodecs.c | 6 +++++- libavcodec/ass_split.c | 4 +++- libavcodec/atrac.c | 4 +--- libavcodec/av1_parse.h | 6 +++++- libavcodec/bitstream.c | 15 +++++++++++++-- libavcodec/bmp.h | 2 -- libavcodec/celp_filters.c | 5 +++-- libavcodec/dcahuff.c | 6 ++++-- libavcodec/dcahuff.h | 7 ++++--- libavcodec/dirac.c | 4 +--- libavcodec/dsd.c | 6 +++--- libavcodec/dsd.h | 5 ++--- libavcodec/elbg.c | 1 - libavcodec/elsdec.c | 1 - libavcodec/exif.h | 4 ++-- libavcodec/fits.c | 7 ++++++- libavcodec/g722.h | 2 +- libavcodec/g723_1.c | 3 ++- libavcodec/g729postfilter.c | 10 +++++++--- libavcodec/gsmdec_data.h | 1 - libavcodec/h261.c | 2 +- libavcodec/h263.c | 9 ++++----- libavcodec/h2645_parse.h | 4 +++- libavcodec/h264_cabac.c | 1 - libavcodec/h264_cavlc.c | 1 - libavcodec/h264_levels.c | 3 ++- libavcodec/h264_mp4toannexb_bsf.c | 2 +- libavcodec/h264_sei.c | 10 ++++++++-- libavcodec/h264data.c | 2 +- libavcodec/h264dsp.c | 1 - libavcodec/h264pred.c | 4 +++- libavcodec/hevc_mp4toannexb_bsf.c | 2 +- libavcodec/ivi_dsp.c | 3 ++- libavcodec/jpegls.c | 4 +++- libavcodec/jpegls.h | 3 +-- libavcodec/lossless_audiodsp.c | 3 ++- libavcodec/lossless_videoencdsp.h | 3 +-- libavcodec/lsp.c | 2 +- libavcodec/lzw.c | 2 +- libavcodec/lzwenc.c | 5 +++-- libavcodec/mlp.h | 2 -- libavcodec/mpc.c | 5 ++--- libavcodec/mpc.h | 3 ++- libavcodec/mpegaudiodecheader.c | 2 -- libavcodec/mpegaudiodecheader.h | 3 ++- libavcodec/nellymoser.c | 4 +++- libavcodec/nellymoser.h | 2 +- libavcodec/pcm_rechunk_bsf.c | 1 - libavcodec/png.c | 4 +++- libavcodec/rangecoder.c | 2 +- libavcodec/raw.h | 3 +-- libavcodec/rle.c | 3 ++- libavcodec/roqvideo.c | 3 ++- libavcodec/rv30dsp.c | 5 ++++- libavcodec/rv40dsp.c | 1 - libavcodec/sbc.c | 1 - libavcodec/sbc.h | 3 ++- libavcodec/setts_bsf.c | 1 - libavcodec/simple_idct.c | 1 - libavcodec/tiff_common.c | 1 + libavcodec/tiff_common.h | 5 ++--- libavcodec/v4l2_buffers.h | 5 ++++- libavcodec/v4l2_context.h | 7 ++++--- libavcodec/v4l2_fmt.h | 3 ++- libavcodec/vc1data.c | 2 +- libavcodec/vp3dsp.c | 5 ++++- libavcodec/vp56dsp.c | 2 +- libavcodec/vp9block.c | 3 --- libavcodec/vp9recon.c | 2 -- libavcodec/wmv2.h | 1 - libavcodec/wmv2dsp.c | 3 ++- libavcodec/x86/cfhddsp_init.c | 3 ++- libavcodec/x86/cfhdencdsp_init.c | 3 ++- libavcodec/x86/h264_intrapred_init.c | 5 ++++- libavcodec/x86/mlpdsp_init.c | 3 +++ libavcodec/x86/snowdsp.c | 3 ++- libavdevice/avdevice.c | 1 - libavdevice/oss.c | 1 - libavdevice/oss.h | 5 +++-- libavdevice/oss_dec.c | 2 -- libavdevice/oss_enc.c | 2 -- libavfilter/af_ashowinfo.c | 2 -- libavformat/mxf.c | 1 + libavformat/mxf.h | 5 +++-- libavformat/riff.c | 5 +++-- libavformat/riff.h | 1 - libavformat/riffdec.c | 5 ++--- libavformat/rtp.h | 6 ++++-- libavformat/rtpdec.h | 3 ++- libavformat/rtpdec_qdm2.c | 1 - libavformat/vpcc.c | 1 + libavformat/vpcc.h | 4 ++-- 98 files changed, 196 insertions(+), 142 deletions(-) diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index 6d09288eee..a0fd00138f 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -26,7 +26,6 @@ #include "libavutil/common.h" -#include "avcodec.h" #include "ac3.h" /** diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index e358f8d9e3..0e52028111 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -27,6 +27,9 @@ #ifndef AVCODEC_AC3_H #define AVCODEC_AC3_H +#include +#include + #define EAC3_MAX_CHANNELS 16 /**< maximum number of channels in EAC3 */ #define AC3_MAX_CHANNELS 7 /**< maximum number of channels, including coupling channel */ #define CPL_CH 0 /**< coupling channel index */ @@ -39,8 +42,6 @@ #define AC3_CRITICAL_BANDS 50 #define AC3_MAX_CPL_BANDS 18 -#include "libavutil/opt.h" -#include "avcodec.h" #include "ac3tab.h" /* exponent encoding strategy */ diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index 85c721dd3b..d006ca8c0a 100644 --- a/libavcodec/ac3dsp.c +++ b/libavcodec/ac3dsp.c @@ -19,9 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include +#include + +#include "config.h" +#include "libavutil/attributes.h" +#include "libavutil/common.h" +#include "libavutil/intmath.h" #include "libavutil/mem_internal.h" -#include "avcodec.h" #include "ac3.h" #include "ac3dsp.h" #include "mathops.h" diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h index c064ba4d63..f0a7476282 100644 --- a/libavcodec/ac3enc.h +++ b/libavcodec/ac3enc.h @@ -30,6 +30,7 @@ #include +#include "libavutil/opt.h" #include "ac3.h" #include "ac3dsp.h" #include "avcodec.h" diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index e53086a754..5c5ea7e27e 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -25,9 +25,8 @@ */ #include "libavutil/channel_layout.h" -#include "libavutil/mem_internal.h" -#include "avcodec.h" +#include "ac3.h" #include "ac3tab.h" /** diff --git a/libavcodec/acelp_filters.c b/libavcodec/acelp_filters.c index 35aa863e7a..b950ba6cbe 100644 --- a/libavcodec/acelp_filters.c +++ b/libavcodec/acelp_filters.c @@ -21,10 +21,12 @@ */ #include +#include +#include "config.h" #include "libavutil/avassert.h" #include "libavutil/common.h" -#include "avcodec.h" +#include "libavutil/log.h" #include "acelp_filters.h" const int16_t ff_acelp_interp_filter[61] = { /* (0.15) */ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 623db2a9fa..71bc21aa05 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -24,9 +24,13 @@ * Provide registration of all codecs, parsers and bitstream filters for libavcodec. */ +#include +#include + #include "config.h" #include "libavutil/thread.h" -#include "avcodec.h" +#include "codec.h" +#include "codec_id.h" extern const AVCodec ff_a64multi_encoder; extern const AVCodec ff_a64multi5_encoder; diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 189272bbd9..85cadcb7a9 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" +#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/mem.h" #include "ass_split.h" typedef enum { diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c index bf9878be45..c3c9d491a5 100644 --- a/libavcodec/atrac.c +++ b/libavcodec/atrac.c @@ -26,13 +26,11 @@ */ #include -#include -#include #include +#include "libavutil/attributes.h" #include "libavutil/thread.h" -#include "avcodec.h" #include "atrac.h" float ff_atrac_sf_table[64]; diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index ae0ebb5a18..3861d80b4c 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -21,10 +21,14 @@ #ifndef AVCODEC_AV1_PARSE_H #define AVCODEC_AV1_PARSE_H +#include #include +#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/intmath.h" + #include "av1.h" -#include "avcodec.h" #include "get_bits.h" // OBU header fields + max leb128 length diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index f0488cafd4..1f77cafae6 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -28,10 +28,21 @@ * bitstream api. */ +#include +#include +#include +#include + +#include "config.h" #include "libavutil/avassert.h" +#include "libavutil/bswap.h" +#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/log.h" +#include "libavutil/mem.h" #include "libavutil/qsort.h" -#include "avcodec.h" -#include "internal.h" #include "mathops.h" #include "put_bits.h" #include "vlc.h" diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h index fb21090678..6b8dcb43ea 100644 --- a/libavcodec/bmp.h +++ b/libavcodec/bmp.h @@ -22,8 +22,6 @@ #ifndef AVCODEC_BMP_H #define AVCODEC_BMP_H -#include "avcodec.h" - typedef enum { BMP_RGB =0, BMP_RLE8 =1, diff --git a/libavcodec/celp_filters.c b/libavcodec/celp_filters.c index 40ff7427df..b96ebcebb3 100644 --- a/libavcodec/celp_filters.c +++ b/libavcodec/celp_filters.c @@ -20,9 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include +#include -#include "avcodec.h" +#include "config.h" #include "celp_filters.h" #include "libavutil/avassert.h" #include "libavutil/common.h" diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index 6197ccfe9b..fec60771ec 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -20,11 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + +#include "libavutil/avassert.h" #include "libavutil/common.h" -#include "avcodec.h" -#include "get_bits.h" #include "dcahuff.h" +#include "put_bits.h" #define TMODE_COUNT 4 static const uint8_t tmode_vlc_bits[TMODE_COUNT] = { 3, 3, 3, 2 }; diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h index 02b0e375ae..c0e04b725a 100644 --- a/libavcodec/dcahuff.h +++ b/libavcodec/dcahuff.h @@ -23,11 +23,12 @@ #ifndef AVCODEC_DCAHUFF_H #define AVCODEC_DCAHUFF_H -#include "libavutil/common.h" +#include + +#include "libavutil/attributes.h" -#include "avcodec.h" -#include "get_bits.h" #include "put_bits.h" +#include "vlc.h" #define DCA_CODE_BOOKS 10 #define DCA_BITALLOC_12_COUNT 5 diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index d5870d6c00..bc51a2fbd7 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -26,12 +26,10 @@ * @author Marco Gerards , David Conrad, Jordi Ortiz */ -#include "libavutil/imgutils.h" +#include "libavutil/pixdesc.h" -#include "avcodec.h" #include "dirac.h" #include "golomb.h" -#include "internal.h" #include "mpeg12data.h" #if CONFIG_DIRAC_PARSE diff --git a/libavcodec/dsd.c b/libavcodec/dsd.c index c18e20436a..e039302c99 100644 --- a/libavcodec/dsd.c +++ b/libavcodec/dsd.c @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include "libavutil/attributes.h" +#include "libavutil/reverse.h" #include "libavutil/thread.h" -#include "libavcodec/internal.h" -#include "libavcodec/mathops.h" -#include "avcodec.h" #include "dsd.h" #define CTABLES ((HTAPS + 7) / 8) /** number of "8 MACs" lookup tables */ diff --git a/libavcodec/dsd.h b/libavcodec/dsd.h index ed09cb9b12..74da74fccc 100644 --- a/libavcodec/dsd.h +++ b/libavcodec/dsd.h @@ -24,9 +24,8 @@ #ifndef AVCODEC_DSD_H #define AVCODEC_DSD_H -#include "libavcodec/internal.h" -#include "libavcodec/mathops.h" -#include "avcodec.h" +#include +#include #define HTAPS 48 /** number of FIR constants */ #define FIFOSIZE 16 /** must be a power of two */ diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index b6049c938b..377d5209cf 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -29,7 +29,6 @@ #include "libavutil/common.h" #include "libavutil/lfg.h" #include "elbg.h" -#include "avcodec.h" #define DELTA_ERR_MAX 0.1 ///< Precision of the ELBG algorithm (as percentage error) diff --git a/libavcodec/elsdec.c b/libavcodec/elsdec.c index cb0e9c6534..ecb5757066 100644 --- a/libavcodec/elsdec.c +++ b/libavcodec/elsdec.c @@ -31,7 +31,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "avcodec.h" #include "elsdec.h" /* ELS coder constants and structures. */ diff --git a/libavcodec/exif.h b/libavcodec/exif.h index 05af756c48..4db84a1c2f 100644 --- a/libavcodec/exif.h +++ b/libavcodec/exif.h @@ -28,8 +28,8 @@ #ifndef AVCODEC_EXIF_H #define AVCODEC_EXIF_H -#include "avcodec.h" -#include "bytestream.h" +#include +#include "libavutil/dict.h" #include "tiff.h" #define EXIF_MAX_IFD_RECURSION 2 diff --git a/libavcodec/fits.c b/libavcodec/fits.c index 97fa7abe80..5f364960e0 100644 --- a/libavcodec/fits.c +++ b/libavcodec/fits.c @@ -19,8 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" +#include +#include +#include +#include #include "libavutil/dict.h" +#include "libavutil/error.h" +#include "libavutil/log.h" #include "fits.h" int avpriv_fits_header_init(FITSHeader *header, FITSHeaderState state) diff --git a/libavcodec/g722.h b/libavcodec/g722.h index 25676a326e..a2a9ae4531 100644 --- a/libavcodec/g722.h +++ b/libavcodec/g722.h @@ -26,7 +26,7 @@ #define AVCODEC_G722_H #include -#include "avcodec.h" +#include "libavutil/log.h" #include "g722dsp.h" #define PREV_SAMPLES_BUF_SIZE 1024 diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 0c47458c23..d19d09dd89 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -21,11 +21,12 @@ */ #include +#include #include "libavutil/common.h" +#include "libavutil/intmath.h" #include "acelp_vectors.h" -#include "avcodec.h" #include "celp_math.h" #include "g723_1.h" diff --git a/libavcodec/g729postfilter.c b/libavcodec/g729postfilter.c index 125a4095f8..f3cacbac05 100644 --- a/libavcodec/g729postfilter.c +++ b/libavcodec/g729postfilter.c @@ -18,10 +18,14 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include "avcodec.h" +#include +#include + +#include "libavutil/common.h" +#include "libavutil/intmath.h" + +#include "audiodsp.h" #include "g729.h" #include "g729postfilter.h" #include "celp_math.h" diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h index f3499e8ae2..576bf071f4 100644 --- a/libavcodec/gsmdec_data.h +++ b/libavcodec/gsmdec_data.h @@ -23,7 +23,6 @@ #define AVCODEC_GSMDEC_DATA_H #include -#include "avcodec.h" typedef struct GSMContext { // Contains first 120 elements from the previous frame diff --git a/libavcodec/h261.c b/libavcodec/h261.c index 01abfadcda..1290c040cd 100644 --- a/libavcodec/h261.c +++ b/libavcodec/h261.c @@ -25,8 +25,8 @@ * H.261 codec */ -#include "avcodec.h" #include "h261.h" +#include "mpegvideo.h" #define IS_FIL(a) ((a) & MB_TYPE_H261_FIL) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 4a03c710a6..f8fba3c9f4 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -27,17 +27,16 @@ * H.263/MPEG-4 codec. */ -#include - #include "libavutil/thread.h" -#include "avcodec.h" #include "mpegvideo.h" #include "h263.h" #include "h263data.h" +#include "h263dsp.h" +#include "idctdsp.h" #include "mathops.h" +#include "mpegpicture.h" #include "mpegutils.h" -#include "flv.h" -#include "mpeg4video.h" +#include "rl.h" static av_cold void h263_init_rl_inter(void) { diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h index 3e47f86c53..20a9d355f2 100644 --- a/libavcodec/h2645_parse.h +++ b/libavcodec/h2645_parse.h @@ -24,7 +24,9 @@ #include #include "libavutil/buffer.h" -#include "avcodec.h" +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "codec_id.h" #include "get_bits.h" #define MAX_MBPAIR_SIZE (256*1024) // a tighter bound could be calculated if someone cares about a few bytes diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 86f0a412fa..973b3419c4 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -35,7 +35,6 @@ #include "cabac.h" #include "cabac_functions.h" #include "internal.h" -#include "avcodec.h" #include "h264dec.h" #include "h264data.h" #include "h264_mvpred.h" diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 9f5f692331..fa8ba5dac7 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -29,7 +29,6 @@ #define UNCHECKED_BITSTREAM_READER 1 #include "internal.h" -#include "avcodec.h" #include "h264dec.h" #include "h264_mvpred.h" #include "h264data.h" diff --git a/libavcodec/h264_levels.c b/libavcodec/h264_levels.c index 801b27fdd9..1b9f78da04 100644 --- a/libavcodec/h264_levels.c +++ b/libavcodec/h264_levels.c @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" +#include +#include "libavutil/common.h" #include "h264_levels.h" // H.264 table A-1. diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index 2822644b10..5a2656197e 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -25,10 +25,10 @@ #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" -#include "avcodec.h" #include "bsf.h" #include "bsf_internal.h" #include "bytestream.h" +#include "defs.h" #include "h264.h" typedef struct H264BSFContext { diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index ca2ca59e1f..15dadba325 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -25,13 +25,19 @@ * @author Michael Niedermayer */ +#include +#include +#include +#include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/mem.h" #include "atsc_a53.h" -#include "avcodec.h" #include "get_bits.h" #include "golomb.h" #include "h264_ps.h" #include "h264_sei.h" -#include "internal.h" +#include "sei.h" #define AVERROR_PS_NOT_FOUND FFERRTAG(0xF8,'?','P','S') diff --git a/libavcodec/h264data.c b/libavcodec/h264data.c index a4c6d93cf0..eb8728a9db 100644 --- a/libavcodec/h264data.c +++ b/libavcodec/h264data.c @@ -30,9 +30,9 @@ #include "libavutil/avutil.h" -#include "avcodec.h" #include "h264dec.h" #include "h264data.h" +#include "mpegutils.h" const uint8_t ff_h264_golomb_to_pict_type[5] = { AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, AV_PICTURE_TYPE_I, diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index d26f552369..e76932b565 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -30,7 +30,6 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "avcodec.h" #include "h264dsp.h" #include "h264idct.h" #include "startcode.h" diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 5632a58fd7..b0fec71f25 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -25,11 +25,13 @@ * @author Michael Niedermayer */ +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" -#include "avcodec.h" +#include "codec_id.h" #include "h264pred.h" +#include "mathops.h" #define BIT_DEPTH 8 #include "h264pred_template.c" diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c index ba1deb2848..790dfb0394 100644 --- a/libavcodec/hevc_mp4toannexb_bsf.c +++ b/libavcodec/hevc_mp4toannexb_bsf.c @@ -24,10 +24,10 @@ #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" -#include "avcodec.h" #include "bsf.h" #include "bsf_internal.h" #include "bytestream.h" +#include "defs.h" #include "hevc.h" #define MIN_HEVCC_LENGTH 23 diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c index 4aedf17907..d7111565c2 100644 --- a/libavcodec/ivi_dsp.c +++ b/libavcodec/ivi_dsp.c @@ -26,7 +26,8 @@ * for Indeo Video Interactive codecs. */ -#include "avcodec.h" +#include +#include "libavutil/common.h" #include "ivi.h" #include "ivi_dsp.h" diff --git a/libavcodec/jpegls.c b/libavcodec/jpegls.c index 7f9fa8d60c..cc598f3c17 100644 --- a/libavcodec/jpegls.c +++ b/libavcodec/jpegls.c @@ -25,7 +25,9 @@ * JPEG-LS common code. */ -#include "internal.h" +#include +#include "libavutil/internal.h" +#include "libavutil/intmath.h" #include "jpegls.h" void ff_jpegls_init_state(JLSState *state) diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index aac67bbe31..ebf9159371 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -28,9 +28,8 @@ #ifndef AVCODEC_JPEGLS_H #define AVCODEC_JPEGLS_H +#include #include "libavutil/common.h" -#include "avcodec.h" -#include "internal.h" #undef near /* This file uses struct member 'near' which in windows.h is defined as empty. */ diff --git a/libavcodec/lossless_audiodsp.c b/libavcodec/lossless_audiodsp.c index 378165924d..274ab5a854 100644 --- a/libavcodec/lossless_audiodsp.c +++ b/libavcodec/lossless_audiodsp.c @@ -20,7 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" +#include "config.h" +#include "libavutil/attributes.h" #include "lossless_audiodsp.h" static int32_t scalarproduct_and_madd_int16_c(int16_t *v1, const int16_t *v2, diff --git a/libavcodec/lossless_videoencdsp.h b/libavcodec/lossless_videoencdsp.h index faa6c32551..7794f03e3f 100644 --- a/libavcodec/lossless_videoencdsp.h +++ b/libavcodec/lossless_videoencdsp.h @@ -19,10 +19,9 @@ #ifndef AVCODEC_LOSSLESS_VIDEOENCDSP_H #define AVCODEC_LOSSLESS_VIDEOENCDSP_H +#include #include -#include "avcodec.h" - typedef struct LLVidEncDSPContext { void (*diff_bytes)(uint8_t *dst /* align 16 */, const uint8_t *src1 /* align 16 */, diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index fb4da47894..29055fd478 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -23,8 +23,8 @@ #include -#include "avcodec.h" #define FRAC_BITS 14 +#include "libavutil/common.h" #include "mathops.h" #include "lsp.h" #include "libavcodec/mips/lsp_mips.h" diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c index e26e4829ee..a917263682 100644 --- a/libavcodec/lzw.c +++ b/libavcodec/lzw.c @@ -27,7 +27,7 @@ * @author modified for use in TIFF by Konstantin Shishkov */ -#include "avcodec.h" +#include "libavutil/attributes.h" #include "bytestream.h" #include "lzw.h" #include "libavutil/mem.h" diff --git a/libavcodec/lzwenc.c b/libavcodec/lzwenc.c index 6c45f7cc37..bb8eb2e1dd 100644 --- a/libavcodec/lzwenc.c +++ b/libavcodec/lzwenc.c @@ -25,9 +25,10 @@ * @author Bartlomiej Wolowiec */ -#include "avcodec.h" +#include +#include "libavutil/avassert.h" +#include "libavutil/common.h" #include "lzw.h" -#include "mathops.h" #include "put_bits.h" #define LZW_MAXBITS 12 diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h index 41a45a30d8..5b7d8c8cac 100644 --- a/libavcodec/mlp.h +++ b/libavcodec/mlp.h @@ -24,8 +24,6 @@ #include -#include "avcodec.h" - /** Last possible matrix channel for each codec */ #define MAX_MATRIX_CHANNEL_MLP 5 #define MAX_MATRIX_CHANNEL_TRUEHD 7 diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c index e29b823460..6aa3e80927 100644 --- a/libavcodec/mpc.c +++ b/libavcodec/mpc.c @@ -26,10 +26,9 @@ * divided into 32 subbands. */ -#include "libavutil/attributes.h" -#include "avcodec.h" +#include +#include "libavutil/intmath.h" #include "mpegaudiodsp.h" -#include "mpegaudio.h" #include "mpc.h" #include "mpcdata.h" diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h index f8093796a3..cef8db4899 100644 --- a/libavcodec/mpc.h +++ b/libavcodec/mpc.h @@ -29,10 +29,11 @@ #ifndef AVCODEC_MPC_H #define AVCODEC_MPC_H +#include + #include "libavutil/lfg.h" #include "libavutil/mem_internal.h" -#include "avcodec.h" #include "bswapdsp.h" #include "mpegaudio.h" #include "mpegaudiodsp.h" diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index 6cc79f18b5..93c5f3d8f8 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -26,8 +26,6 @@ #include "libavutil/common.h" -#include "avcodec.h" -#include "internal.h" #include "mpegaudio.h" #include "mpegaudiodata.h" #include "mpegaudiodecheader.h" diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h index 1da2a4cb6f..ed5d1f3b33 100644 --- a/libavcodec/mpegaudiodecheader.h +++ b/libavcodec/mpegaudiodecheader.h @@ -27,7 +27,8 @@ #ifndef AVCODEC_MPEGAUDIODECHEADER_H #define AVCODEC_MPEGAUDIODECHEADER_H -#include "avcodec.h" +#include +#include "codec_id.h" #define MP3_MASK 0xFFFE0CCF diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c index 5ff6583c5e..66c5f83a56 100644 --- a/libavcodec/nellymoser.c +++ b/libavcodec/nellymoser.c @@ -31,9 +31,11 @@ * implementors. The original code is available from http://code.google.com/p/nelly2pcm/ */ +#include + +#include "libavutil/intmath.h" #include "libavutil/common.h" -#include "avcodec.h" #include "nellymoser.h" const float ff_nelly_dequantization_table[127] = { diff --git a/libavcodec/nellymoser.h b/libavcodec/nellymoser.h index 027fc7ed23..6d032c97be 100644 --- a/libavcodec/nellymoser.h +++ b/libavcodec/nellymoser.h @@ -34,7 +34,7 @@ #ifndef AVCODEC_NELLYMOSER_H #define AVCODEC_NELLYMOSER_H -#include "avcodec.h" +#include #define NELLY_BANDS 23 #define NELLY_BLOCK_LEN 64 diff --git a/libavcodec/pcm_rechunk_bsf.c b/libavcodec/pcm_rechunk_bsf.c index 32a90cd2f7..7cf763359d 100644 --- a/libavcodec/pcm_rechunk_bsf.c +++ b/libavcodec/pcm_rechunk_bsf.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" #include "bsf.h" #include "bsf_internal.h" #include "libavutil/avassert.h" diff --git a/libavcodec/png.c b/libavcodec/png.c index ef52b51bd4..4ea286075d 100644 --- a/libavcodec/png.c +++ b/libavcodec/png.c @@ -18,7 +18,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" + +#include +#include "libavutil/mem.h" #include "png.h" /* Mask to determine which y pixels are valid in a pass */ diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index fa7d5526d1..510dab2c29 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -34,9 +34,9 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" +#include "libavutil/bswap.h" #include "libavutil/intreadwrite.h" -#include "avcodec.h" #include "rangecoder.h" av_cold void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size) diff --git a/libavcodec/raw.h b/libavcodec/raw.h index 28a27b1f9e..6a041690b1 100644 --- a/libavcodec/raw.h +++ b/libavcodec/raw.h @@ -27,9 +27,8 @@ #ifndef AVCODEC_RAW_H #define AVCODEC_RAW_H -#include "avcodec.h" +#include "libavutil/pixfmt.h" #include "internal.h" -#include "libavutil/internal.h" typedef struct PixelFormatTag { enum AVPixelFormat pix_fmt; diff --git a/libavcodec/rle.c b/libavcodec/rle.c index 792bc05e5d..1ef6077a6b 100644 --- a/libavcodec/rle.c +++ b/libavcodec/rle.c @@ -19,9 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "libavutil/common.h" -#include "avcodec.h" #include "rle.h" int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same) diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c index 8eda93c13c..f9a3c8e083 100644 --- a/libavcodec/roqvideo.c +++ b/libavcodec/roqvideo.c @@ -24,7 +24,8 @@ * id RoQ Video common functions based on work by Dr. Tim Ferguson */ -#include "avcodec.h" +#include +#include #include "roqvideo.h" static inline void block_copy(unsigned char *out, unsigned char *in, diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c index 8b205e09b6..c2624a9113 100644 --- a/libavcodec/rv30dsp.c +++ b/libavcodec/rv30dsp.c @@ -24,10 +24,13 @@ * RV30 decoder motion compensation functions */ -#include "avcodec.h" +#include +#include +#include "libavutil/attributes.h" #include "h264chroma.h" #include "h264qpel.h" #include "mathops.h" +#include "qpeldsp.h" #include "rv34dsp.h" #define RV30_LOWPASS(OPNAME, OP) \ diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index 2ac791d674..414c4d30b1 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -26,7 +26,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "avcodec.h" #include "h264qpel.h" #include "mathops.h" #include "pixels.h" diff --git a/libavcodec/sbc.c b/libavcodec/sbc.c index b43b66e3f5..47d88f28df 100644 --- a/libavcodec/sbc.c +++ b/libavcodec/sbc.c @@ -30,7 +30,6 @@ * SBC common functions for the encoder and decoder */ -#include "avcodec.h" #include "sbc.h" /* A2DP specification: Appendix B, page 69 */ diff --git a/libavcodec/sbc.h b/libavcodec/sbc.h index 419c8eab90..0a54f1fbbc 100644 --- a/libavcodec/sbc.h +++ b/libavcodec/sbc.h @@ -33,7 +33,8 @@ #ifndef AVCODEC_SBC_H #define AVCODEC_SBC_H -#include "avcodec.h" +#include +#include #include "libavutil/crc.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c index 2558e38f51..318913c7fe 100644 --- a/libavcodec/setts_bsf.c +++ b/libavcodec/setts_bsf.c @@ -26,7 +26,6 @@ #include "libavutil/opt.h" #include "libavutil/eval.h" -#include "avcodec.h" #include "bsf.h" #include "bsf_internal.h" diff --git a/libavcodec/simple_idct.c b/libavcodec/simple_idct.c index 0ef167491a..eb13cff146 100644 --- a/libavcodec/simple_idct.c +++ b/libavcodec/simple_idct.c @@ -26,7 +26,6 @@ */ #include "libavutil/intreadwrite.h" -#include "avcodec.h" #include "mathops.h" #include "simple_idct.h" diff --git a/libavcodec/tiff_common.c b/libavcodec/tiff_common.c index 0af62ee962..b3c6b96b57 100644 --- a/libavcodec/tiff_common.c +++ b/libavcodec/tiff_common.c @@ -25,6 +25,7 @@ * @author Thilo Borgmann */ +#include "libavutil/bprint.h" #include "tiff_common.h" diff --git a/libavcodec/tiff_common.h b/libavcodec/tiff_common.h index 019d23e6d5..e429b8eaeb 100644 --- a/libavcodec/tiff_common.h +++ b/libavcodec/tiff_common.h @@ -28,10 +28,9 @@ #ifndef AVCODEC_TIFF_COMMON_H #define AVCODEC_TIFF_COMMON_H -#include "avcodec.h" -#include "tiff.h" +#include +#include "libavutil/dict.h" #include "bytestream.h" -#include "libavutil/bprint.h" /** data type identifiers for TIFF tags */ enum TiffTypes { diff --git a/libavcodec/v4l2_buffers.h b/libavcodec/v4l2_buffers.h index 8dbc7fc104..3d2ff1b9a5 100644 --- a/libavcodec/v4l2_buffers.h +++ b/libavcodec/v4l2_buffers.h @@ -25,9 +25,12 @@ #define AVCODEC_V4L2_BUFFERS_H #include +#include #include -#include "avcodec.h" +#include "libavutil/buffer.h" +#include "libavutil/frame.h" +#include "packet.h" enum V4L2Buffer_status { V4L2BUF_AVAILABLE, diff --git a/libavcodec/v4l2_context.h b/libavcodec/v4l2_context.h index 22a9532444..6f7460c89a 100644 --- a/libavcodec/v4l2_context.h +++ b/libavcodec/v4l2_context.h @@ -24,13 +24,14 @@ #ifndef AVCODEC_V4L2_CONTEXT_H #define AVCODEC_V4L2_CONTEXT_H -#include +#include #include -#include "libavcodec/avcodec.h" #include "libavutil/pixfmt.h" #include "libavutil/frame.h" -#include "libavutil/buffer.h" +#include "libavutil/rational.h" +#include "codec_id.h" +#include "packet.h" #include "v4l2_buffers.h" typedef struct V4L2Context { diff --git a/libavcodec/v4l2_fmt.h b/libavcodec/v4l2_fmt.h index 01360029c8..577e03a7a7 100644 --- a/libavcodec/v4l2_fmt.h +++ b/libavcodec/v4l2_fmt.h @@ -24,8 +24,9 @@ #ifndef AVCODEC_V4L2_FMT_H #define AVCODEC_V4L2_FMT_H -#include "libavcodec/avcodec.h" +#include #include "libavutil/pixfmt.h" +#include "codec_id.h" enum AVPixelFormat ff_v4l2_format_v4l2_to_avfmt(uint32_t v4l2_fmt, enum AVCodecID avcodec); uint32_t ff_v4l2_format_avcodec_to_v4l2(enum AVCodecID avcodec); diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c index 19f1cad45f..844bc0f5c5 100644 --- a/libavcodec/vc1data.c +++ b/libavcodec/vc1data.c @@ -26,9 +26,9 @@ * VC-1 tables. */ -#include "avcodec.h" #include "vc1.h" #include "vc1data.h" +#include "vlc.h" /** Table for conversion between TTBLK and TTMB */ const int ff_vc1_ttblk_to_tt[3][8] = { diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index ec859a679d..f06834f42e 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -24,12 +24,15 @@ * source code. */ +#include + +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/common.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" -#include "avcodec.h" #include "rnd_avg.h" #include "vp3dsp.h" diff --git a/libavcodec/vp56dsp.c b/libavcodec/vp56dsp.c index e8d93d6680..de6803e0fb 100644 --- a/libavcodec/vp56dsp.c +++ b/libavcodec/vp56dsp.c @@ -21,8 +21,8 @@ #include +#include "config.h" #include "libavutil/attributes.h" -#include "avcodec.h" #include "vp56dsp.h" #include "libavutil/common.h" diff --git a/libavcodec/vp9block.c b/libavcodec/vp9block.c index ec16e26c69..5e6cded2bc 100644 --- a/libavcodec/vp9block.c +++ b/libavcodec/vp9block.c @@ -23,9 +23,6 @@ #include "libavutil/avassert.h" -#include "avcodec.h" -#include "internal.h" -#include "videodsp.h" #include "vp56.h" #include "vp9.h" #include "vp9data.h" diff --git a/libavcodec/vp9recon.c b/libavcodec/vp9recon.c index e38cf99ec5..503091e545 100644 --- a/libavcodec/vp9recon.c +++ b/libavcodec/vp9recon.c @@ -24,8 +24,6 @@ #include "libavutil/avassert.h" #include "libavutil/mem_internal.h" -#include "avcodec.h" -#include "internal.h" #include "videodsp.h" #include "vp9data.h" #include "vp9dec.h" diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h index f425332c9a..1798dbabcd 100644 --- a/libavcodec/wmv2.h +++ b/libavcodec/wmv2.h @@ -23,7 +23,6 @@ #include "libavutil/mem_internal.h" -#include "avcodec.h" #include "intrax8.h" #include "mpegvideo.h" #include "wmv2dsp.h" diff --git a/libavcodec/wmv2dsp.c b/libavcodec/wmv2dsp.c index 543f01b852..3bd482176a 100644 --- a/libavcodec/wmv2dsp.c +++ b/libavcodec/wmv2dsp.c @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/common.h" -#include "avcodec.h" #include "idctdsp.h" #include "mathops.h" +#include "qpeldsp.h" #include "wmv2dsp.h" #define W0 2048 diff --git a/libavcodec/x86/cfhddsp_init.c b/libavcodec/x86/cfhddsp_init.c index ab7ff83087..c5d89561ae 100644 --- a/libavcodec/x86/cfhddsp_init.c +++ b/libavcodec/x86/cfhddsp_init.c @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/avcodec.h" #include "libavcodec/cfhddsp.h" void ff_cfhd_horiz_filter_sse2(int16_t *output, ptrdiff_t out_stride, diff --git a/libavcodec/x86/cfhdencdsp_init.c b/libavcodec/x86/cfhdencdsp_init.c index 28f1dd504d..1e3586e08c 100644 --- a/libavcodec/x86/cfhdencdsp_init.c +++ b/libavcodec/x86/cfhdencdsp_init.c @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/avcodec.h" #include "libavcodec/cfhdencdsp.h" void ff_cfhdenc_horiz_filter_sse2(int16_t *input, int16_t *low, int16_t *high, diff --git a/libavcodec/x86/h264_intrapred_init.c b/libavcodec/x86/h264_intrapred_init.c index bdd5125d68..a95cfbca55 100644 --- a/libavcodec/x86/h264_intrapred_init.c +++ b/libavcodec/x86/h264_intrapred_init.c @@ -18,10 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" #include "libavcodec/h264pred.h" #define PRED4x4(TYPE, DEPTH, OPT) \ diff --git a/libavcodec/x86/mlpdsp_init.c b/libavcodec/x86/mlpdsp_init.c index cb90ca24f0..950f996832 100644 --- a/libavcodec/x86/mlpdsp_init.c +++ b/libavcodec/x86/mlpdsp_init.c @@ -19,8 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/macros.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/mlpdsp.h" diff --git a/libavcodec/x86/snowdsp.c b/libavcodec/x86/snowdsp.c index 84bc74f915..bca1f9bd2e 100644 --- a/libavcodec/x86/snowdsp.c +++ b/libavcodec/x86/snowdsp.c @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" -#include "libavcodec/avcodec.h" #include "libavcodec/snow.h" #include "libavcodec/snow_dwt.h" diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 22b7595ab1..2ae26ab8e3 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -19,7 +19,6 @@ #include "libavutil/avassert.h" #include "libavutil/samplefmt.h" #include "libavutil/pixfmt.h" -#include "libavcodec/avcodec.h" #include "avdevice.h" #include "internal.h" #include "config.h" diff --git a/libavdevice/oss.c b/libavdevice/oss.c index d92cde3313..eddc2ddf1a 100644 --- a/libavdevice/oss.c +++ b/libavdevice/oss.c @@ -32,7 +32,6 @@ #include "libavutil/log.h" -#include "libavcodec/avcodec.h" #include "avdevice.h" #include "oss.h" diff --git a/libavdevice/oss.h b/libavdevice/oss.h index 1f3f5e4e83..66d1a34cf6 100644 --- a/libavdevice/oss.h +++ b/libavdevice/oss.h @@ -19,8 +19,9 @@ #ifndef AVDEVICE_OSS_H #define AVDEVICE_OSS_H -#include "libavcodec/avcodec.h" - +#include +#include "libavutil/log.h" +#include "libavcodec/codec_id.h" #include "libavformat/avformat.h" #define OSS_AUDIO_BLOCK_SIZE 4096 diff --git a/libavdevice/oss_dec.c b/libavdevice/oss_dec.c index 34efb6b184..4f3772c1f5 100644 --- a/libavdevice/oss_dec.c +++ b/libavdevice/oss_dec.c @@ -34,8 +34,6 @@ #include "libavutil/opt.h" #include "libavutil/time.h" -#include "libavcodec/avcodec.h" - #include "avdevice.h" #include "libavformat/internal.h" diff --git a/libavdevice/oss_enc.c b/libavdevice/oss_enc.c index 6c1bc042c1..3103d2de9a 100644 --- a/libavdevice/oss_enc.c +++ b/libavdevice/oss_enc.c @@ -30,8 +30,6 @@ #include "libavutil/internal.h" -#include "libavcodec/avcodec.h" - #include "avdevice.h" #include "libavformat/internal.h" diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 652197b2d1..db8aa029c4 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -37,8 +37,6 @@ #include "libavutil/timestamp.h" #include "libavutil/samplefmt.h" -#include "libavcodec/avcodec.h" - #include "audio.h" #include "avfilter.h" #include "internal.h" diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 7c355d789b..36d662b58c 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -20,6 +20,7 @@ */ #include "libavutil/common.h" +#include "libavcodec/codec_id.h" #include "mxf.h" const uint8_t ff_mxf_random_index_pack_key[16] = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x11,0x01,0x00 }; diff --git a/libavformat/mxf.h b/libavformat/mxf.h index b1b1fedac7..eb473d8a55 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -21,9 +21,10 @@ #ifndef AVFORMAT_MXF_H #define AVFORMAT_MXF_H -#include "avformat.h" -#include "libavcodec/avcodec.h" #include +#include "libavutil/log.h" +#include "libavutil/pixfmt.h" +#include "libavutil/rational.h" typedef uint8_t UID[16]; diff --git a/libavformat/riff.c b/libavformat/riff.c index 270ff7c024..423926e3bd 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -20,9 +20,10 @@ */ #include "config.h" -#include "libavutil/error.h" -#include "libavcodec/avcodec.h" +#include "libavutil/common.h" #include "avformat.h" +#include "internal.h" +#include "metadata.h" #include "riff.h" /* Note: When encoding, the first matching tag is used, so order is diff --git a/libavformat/riff.h b/libavformat/riff.h index 0548279c6b..85d6786663 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -28,7 +28,6 @@ #ifndef AVFORMAT_RIFF_H #define AVFORMAT_RIFF_H -#include "libavcodec/avcodec.h" #include "avio.h" #include "internal.h" #include "metadata.h" diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 533bb5a15d..444b9fc00d 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -19,12 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/dict.h" #include "libavutil/error.h" +#include "libavutil/intreadwrite.h" #include "libavutil/log.h" -#include "libavutil/mathematics.h" -#include "libavcodec/avcodec.h" -#include "libavcodec/bytestream.h" #include "avformat.h" #include "avio_internal.h" #include "riff.h" diff --git a/libavformat/rtp.h b/libavformat/rtp.h index 54512c6f71..389b824223 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -21,9 +21,11 @@ #ifndef AVFORMAT_RTP_H #define AVFORMAT_RTP_H +#include +#include "libavutil/avutil.h" +#include "libavcodec/codec_id.h" +#include "libavcodec/codec_par.h" #include "libavformat/avformat.h" -#include "libavcodec/avcodec.h" -#include "libavutil/mathematics.h" /** * Return the payload type for a given stream used in the given format context. diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 701ce072b6..d54a05869f 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -23,7 +23,8 @@ #ifndef AVFORMAT_RTPDEC_H #define AVFORMAT_RTPDEC_H -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" +#include "libavcodec/packet.h" #include "avformat.h" #include "rtp.h" #include "url.h" diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c index 1eec2da5b4..dce3c48bcc 100644 --- a/libavformat/rtpdec_qdm2.c +++ b/libavformat/rtpdec_qdm2.c @@ -28,7 +28,6 @@ #include #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" -#include "libavcodec/avcodec.h" #include "internal.h" #include "rtp.h" #include "rtpdec.h" diff --git a/libavformat/vpcc.c b/libavformat/vpcc.c index e0b7f288a6..8b4f913b5d 100644 --- a/libavformat/vpcc.c +++ b/libavformat/vpcc.c @@ -21,6 +21,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/pixfmt.h" +#include "libavcodec/avcodec.h" #include "vpcc.h" enum VPX_CHROMA_SUBSAMPLING diff --git a/libavformat/vpcc.h b/libavformat/vpcc.h index e87bec55c2..f05b2f58b3 100644 --- a/libavformat/vpcc.h +++ b/libavformat/vpcc.h @@ -27,10 +27,10 @@ #ifndef AVFORMAT_VPCC_H #define AVFORMAT_VPCC_H -#include +#include "libavutil/rational.h" +#include "libavcodec/codec_par.h" #include "avio.h" #include "avformat.h" -#include "libavcodec/avcodec.h" typedef struct VPCC { int profile; From patchwork Mon Jun 14 22:41:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28280 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247984iol; Mon, 14 Jun 2021 15:44:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYzZS6KUj2/QWUXTaNTuma9i6CgAcZiilM/Hyjw7J5XBjF/hqRDnNhFbs5b9LWJfomFEXL X-Received: by 2002:a05:6402:885:: with SMTP id e5mr20154922edy.248.1623710672286; Mon, 14 Jun 2021 15:44:32 -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 i11si13419647ejo.362.2021.06.14.15.44.31; Mon, 14 Jun 2021 15:44:32 -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=pmxNykOH; 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 32CC4689D32; Tue, 15 Jun 2021 01:42:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2025.outbound.protection.outlook.com [40.92.17.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDDE8689BE0 for ; Tue, 15 Jun 2021 01:42:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FTiC4DEdOpq8MFW9gIEAnVuMPt7Pugq7J7VnDJofnj3yfXDh9n+vDB8K84Jyyvk8cxChjSdrk1BwYtxWwFSD7pWU3Xfmm9EUYmnuG6cj/EuNa4CWV7K/aOzP8pJcSHO3cRQ36AGmWoR0991fAPnbQwVpwMDL/CJuF3e2tkso70pFGv8u3OZ3dvS/OL2vYfZ2ElWYH+IrEyMqd9IFzpwCISrOsQnOey8OzXY3jvx1pP0k694zqb/TTGeKD7gaYwFDCF8Xn66Vib61HuV0+TVYNIrQtJPI1mqgCgYLD87qvgzhLeSKA2jrka3BWNr6/XGo7xRWs1v3l+TD6bVBKINVWw== 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=WA3InwQQS6+yW9TTxNPqVs8aZl7ewmZClPT8PFk3xhg=; b=UM5Noq+uZPBNUNEMgb2IaFKBhO0NIUeovBNJc9BFs5Mdm9qrlOKQGDmnrbIXYSy/vb+jSRag5zFsKBSVVSjGD13m36z+2OF2pry4NDQ3bLY9xJrTmsGiwMQGnzearsa29y6r7vgaSd9QTHI8FLdgcoZfbkMmzPy+BSgnWgJm39S9DJp6PhPqEWDVDaEnpDDmw5jXM3+PwEglrKFOaIxVYVGxQH7bQiO93B08jnrvo/AuAs4GSD9qktWf6yAQXebbOwQgPPmdn3lpsIXHiKUVek27/2r3rkvbADkJxFNTcciIrp1z/fZKZf5YmKwmVH3gvpTiFkRbZxKUuUPhYIu4pA== 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=WA3InwQQS6+yW9TTxNPqVs8aZl7ewmZClPT8PFk3xhg=; b=pmxNykOHPE5AU8psjPIk7jQC5uKkEP3Q6ndVQR9XHIQ+1ov4PRLZM191WsPqgkzc4Mug2pU/u9HOF6ED70vwd7F4zSFEFTGuRw3Z6fvYZMmkuoA0McrSvsKPiBdfga6VedW5mbXwui8tWGUag5uRwZplX76Quzc5mLMPsjASRseSRMBpjx0I4wKrwXDCfdjyfgS12YJ4zQuQcuT7Z8iSkcLDUmxXB20n9+sY0GKh1tU63oHMBehN1Mmsg/j6tqjRx8pdxDrqEW7DMFuzIcKm2L1BbU+oDOMiOL6AJR3KLJhGxT0asnvH+Nolux4ixA1jwK+GJdzY+7Mur2eVIEm2Uw== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::45) by DB8EUR06HT016.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::388) 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:42:14 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) 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:42:14 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F260CFF3E586B9C596DC4502374CB666C19C75CB93B11F937F75BD1B257309F7; UpperCasedChecksum:86047FA5C4A21D86544A5E9C59ACB48B9B86CD72079C970A3019D34F84677F2F; SizeAsReceived:7590; Count:48 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:42:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:33 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [3WpeBvv3uniLTGz67ykDGcB/wI7tvcXo] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) 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:42:13 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4c8bf8f1-8a27-45fe-83e0-08d92f85a785 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViQP5DY1gVUR1zMefR9ogQwr1zPbZIxLgpObg7UiBIrh5509/yFlbEwgApLTYOe1IJUNjWovKTj0tlx7RAl1ZDAR1zINjnxhZ6L2r2u124CRHUMX2mMon0VpAsWDoe0QkakqN38mZ/ENreYjv0u0hGTYV3nLXeT21Pr5aLXXV/iCBnCRAkgIZ9qPHsNhKLifb0VlaJo0gVYnlyUh+jRxwAIzz3UgYqBzoweVMamamewK0xHAW1rKMyzIaaG3hvxvHA1JbNDvx5P637znQ2v5bYb33FtZBWRBcy04ykwLEgVLsRs6RsZ7FDIfOulZc0FMwDvwTEQysddrztVDJHPRcbC0AqCT7ZFJsFTuZdkyYgC0xWwTJYL2J8jhydnDl72f4pZP7ajrvGa2dOqRFjuhiEgja1iFbhjM4FvtwURNi3ct2WoA7lqiuhm35xyixECAwVZPavdQwBKmF8Xn0NRE4RSs/1G0CO04GGKf3qXm6XtH1V55WaAumsiZ/lOVIbsGVRhjHlJ7hW3iS0BezRSbkLlWkJ2ESkfEv63oEtnYKzy4Anq1irrtIDc4j+p9fbF7tSCVMEDJ5qE3qvaYnGux68P9ovHj3PUUyqidzOeADMB/QLUkXMOkaAeoAOvuQv0ffI/bavq6j3VcslLYR15ysLPXRIGEXUITASy9itfkAnL2GC3cR45Aefvt/qaxB3zBUTEO9jDRqZMpKjeKEYZVYjZyn4i9Bo3Yc= X-MS-TrafficTypeDiagnostic: DB8EUR06HT016: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pQrkTgO7PO+EmAxU96odMVeBFbU9rcOX5t/qN+W1GHtKHbyXdyiMGvcyBmcmEbJ8vIHKZ0/2NSQr+2blj7jkYmlAxovFcIu+UFVBkZLJBeMhk2V2sL6Lw5Zo5Pu1eoToCmxKF6FiQ0NR1WZUCW5VqPqQHSyRg3WNhm/kfWxX+T814Fwy/dPWHXlpjkUvoZnKmzkRvMq7rybaC9+ekhDc8IkbyedJkszSkpVibgpEWUfN/ejXKkkksccmMUx5NV+TpkV+CZ5Rn6zuxAk0qyNbIYNzuim0pVDK2Sk/DlEvfw0Kdv7RxDyXsycaPMyR+GkkzAhh0BMUW5jyEO1aUSZmnjfN0rioPD6MZaiHaar80sO0+P7/qQNHdV7UMCSFdreLdlx/BdmC/aa0sIvyU73tHQ== X-MS-Exchange-AntiSpam-MessageData: z2YcrkLrHxkgEclHFxdQ1D/Pbhre3XEzjOQFQe4+O6WSHJPQnJJjXQIpaX2c1I3S+yJPh4lCJJcHzigRrtBpr8KrcExkg+IBNFBXk6YuvaOXM7cyx9sRER+XMUMI2UE157RZ/ivowZsd5XaK1Irdeg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c8bf8f1-8a27-45fe-83e0-08d92f85a785 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:13.9955 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.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: DB8EUR06HT016 Subject: [FFmpeg-devel] [PATCH 17/17] avcodec/libavcodec.v: Tighten export whitelist 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: vB5aBRs7Zmvl Currently every symbol (with external linkage) that starts with "av" is exported. Yet libaom-av1 has lots of functions that are not meant to be exported and start with "av1_" (I counted 1236); and libvpx has average_split_mvs. These functions are exported if one links these libraries statically into a shared libavcodec.so. Solve this by tightening the whitelist to "av_", "avcodec_", "avpriv_" and (as a special-case) "avsubtitle_free". Signed-off-by: Andreas Rheinhardt --- libavcodec/libavcodec.v | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/libavcodec.v b/libavcodec/libavcodec.v index f1d5e5bc77..d863e056a5 100644 --- a/libavcodec/libavcodec.v +++ b/libavcodec/libavcodec.v @@ -1,6 +1,9 @@ LIBAVCODEC_MAJOR { global: - av*; + av_*; + avcodec_*; + avpriv_*; + avsubtitle_free; local: *; };