From patchwork Wed Nov 1 08:35:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288185pzb; Wed, 1 Nov 2023 01:34:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELKemaIoTOmfHqlIu8QFWl+IbAJkM7Ddpn6t5u6v/wspvEYMgMqg6cBbrpGdfVaOv7y6ri X-Received: by 2002:a17:907:74a:b0:9bd:f4b8:b0bd with SMTP id xc10-20020a170907074a00b009bdf4b8b0bdmr1314726ejb.6.1698827660092; Wed, 01 Nov 2023 01:34: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 29-20020a170906209d00b009ad84bdfe4fsi1325511ejq.581.2023.11.01.01.34.19; Wed, 01 Nov 2023 01:34: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=ih3tYPFR; 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 13D0B68CD66; Wed, 1 Nov 2023 10:34:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2027.outbound.protection.outlook.com [40.92.89.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00A0368CCC6 for ; Wed, 1 Nov 2023 10:34:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dboyg8nT6rchzfrf2sTACzhEn61JPOHSdpqfzj37rnPHGfuSKZbtutKR85kqn8ENz5vDNJP5kXQ5E3ojDWwd1mIKhvIuhULUhfursu1Ca7ATj9sODbTF5ZK1XyrUNphZGcN1LswmU5JGrYy94M44FhxSaLzgjwB2te7IfZI+pKmvba/jZfJfrqWq4stcGVNjsEwKlmn6W/k3fXFVzO3jvwMeuDcxAfmd4lKDq/P2ud4W4kGIcMkgEWeArEkb5kTtwtQhVVgd0yr7gjMI7dkkfGYrflHGxeIs8f5LBpxJf/bW8yyfZwSWX1ZmKQ1/MuwxHiunf2I29yqTsWtM88W3UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8ZGeR/DHvvRa8c55cb+MCCNjXKd6EfUIC69mPu6nhjY=; b=L5YNNCN1a7BHitxfRkkxtrLFPVnYNFHBkhasdGgPcRgMChniQmSdvz6suWS0W/ryvKQPMVHBXzy4nt5yxT8VgGJB7h/iiUgTq/RJMhkj9nv1qRFtyDenngbGLrE0Giyl/lT/2nR6s/9YyjwDui2PQF9FIUpg6hdhenwACD7o6FpFmE79XOdp6eLGH+O4ZnPyxIOZTG1WhSWDuSLRkRVQPnPBXnuGZU8dvTAJqqa4sOM7QMPs8BuU6+2wHlXlgxEvjwywzn9O6JJj8MwI4aiA4NUVecFNrrT/5snRZV5UiQ8nSDyzhLqjxti0u9v6uooi2QvChChyKMQEeXjYVG5Ijg== 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=8ZGeR/DHvvRa8c55cb+MCCNjXKd6EfUIC69mPu6nhjY=; b=ih3tYPFRKd8AOYJv27jP/dO1Pi+SizCFbV6ti9RRTUSijZGEGXXjfXjNwVLjeeAE9gK5R5ndjd/zuY37C/Y5rXUZekuwqTod3ZUc6G+V4AwPb4IEN4sP5TTW9tAf4TuPMthGmvz10hfKo9mFWwADhJY8OA7FWquIL0pXjGFlDKZ+0yanUwpgRe0WDiaRBKm014VFUgcJtgBWO54QZmT9DJ4PStXRT9rngVmadf/AEhNceFL3S0t/c+AbgjQCgQqO67LznZeTZ9D8V/hKnLJ5ix9m7/6YPgwysG+B6fUIY/sFSI/4UfJwJPu9FrFDTVzxUXtW8JMwGL3kY7Loue1gpw== Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) by AM8P250MB0215.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 1 Nov 2023 08:34:06 +0000 Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768]) by GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768%3]) with mapi id 15.20.6933.029; Wed, 1 Nov 2023 08:34:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:04 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DId2TUkPEslZj9eR87/ovQigswgEwBexvJeIwKj5jBc=] X-ClientProxiedBy: ZR0P278CA0193.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::23) To GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) X-Microsoft-Original-Message-ID: <20231101083512.3398680-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0033:EE_|AM8P250MB0215:EE_ X-MS-Office365-Filtering-Correlation-Id: 93446c9b-58ce-493f-4817-08dbdab54fb3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MdF9esDmJXiTlcNMCC7Q+7LCngjegxDRb8hJCWnwzEqvFkCO95+5g7L/xefhMyb+B8ITnpmyZtEr2HF/yKSiQrnFNvVrAUtFpxvUMxYoLyD21ehocITIHgWrrQQXtsV7sfcSYTVt3eqy2PRGCthwtZEVbCm9vYy234ZpdgOv3Grp9GAJ8FGWwaYnE/V40iUDN9KljN8o0LP2sUBv+zIzjwl0smAwr+7NDg0gwkhy+PIOytwI6rR87p23JJ01Zq5BhHo7qXFkBjkuTY8bdlwCiXE2HljEa5bU2edWRWfJ3cmAqRRiFvfmTuVeHwZw7ndn9p+dqP7KAL0L+RAhlEROxEr9Y447rVU8JJB1gkamWj8v1ErtMGChB/MU2sfYBb/jEG2pta7IC2bMbKkX0r1NsWBzrrU1XdFkegvOUovVaSzp8fkIjZqSjxxHseUn+m5uQ08q1JDammtOU6CwwymjUhqWfyfsHVrQqsdRdoaJ6Om2QRylC0aelAuEwEeGvPXOfar6vNLLwrfcYCdLMiDq7kmXevGh7k0G7Hk509woEdbxuUtuwt5qSMtdhylnxqDiDG6tGqbqDQAMA2KeFxEYkBy9JqF3oqXGqPlzP7IyV5M0XiDScESAxuYSH43e0hqT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EiQSg/04fsKj+rf7mN2eKL8GoWjsFCwLk70ejrmYoZKPfLqOLGf4b5YEG3x7F9HbwnzT4cB/02cEhzIku6rrpe33+kSYGhC4tq+lpjV603XjidiUvG8py7xzqERw08SCQObhhs1KOg/pviby8Xk/aN4IKYMKGNn6zaYs5JPDFL7WbjeAh/Lv9d3MuzLeRcLIfwnoLkNGJO+INLGIrREXPnGZEebsxSvjCOeus8juxrGosTHm9vb61CQPrh/uP3WDgNu0rXFlfsCKP4xiFomBSvGnm5lmBlXedYx1aNj7YnATDoFk9Ph+8vFK7mRk2UGwOF7x8e1s5zWHRChiJtDOS8qBGbDuAsaozpC2mUrQ7T/Pcwv/kU5Sr7Cknb8ssJNnff2I4JEGds+ntvh8mVRjmNk3Jy9gtP9nPaLgx3CuKLuYTjScv5lh2E15jf7JXoK9DodJeL8d/S+KA2Moh/nF0Y8Hn3jSn04yU6mq8cw7ZMatPAXP1NbJRxjmuNg+jFqhOq55987xOgVUpm5PJBTQqBxYWW1iTpe1lx4tak6SD4rcTRSimMJocjrCyfb+K6J2Vu4cJ29zuSqzhNhNTlC1kiOwsFvXVbeGsE1LBuamAXYqmUdmSJ33g1CTITQS0uUVGjkoYktQaSJaYzgiY0Jf8IchXj0+HuGbD2VVltIM9PGG0j9G5GhWv1dAhYdkbHNN2q5/eLjIZlxy97EdOSW0eSu7L2eYY2gDeQLpRQJGEodtlw3wjAnEdW/AC+2CNbGh4ZHMxpjrVwwcrQNSK1i3o9xHbvBYpSq8Sc2H/9YJd2EQWguEvPTvHTxuaElwOzK4QilPsWdUG80qLk6bSh7DFsjlKDyLKBN1hMaj1AeOb9XUgSUkCxrL1tpfFBGDcN57hhWgSS6fUPIyPnsF4b6g15VHztlrWT8+zKai60TG+WgfX+vsZ5NrkUzEd5zKRJvHMSkgu8MBNYTrXsR0aViPK0gXqFQG3Seb1SE+1bYnhoiZFEddekwKmmuNlw76nrbrNWQIs95ZoGRdfDiGEWsaX9STChCmQRbw02EN6XruC17mIFLfE5ViEgnbneO6VdkrNYNnKazH/gKe6f567HOkXIF4q6kRWmg4MY7HALIVfaTVpi5pCgxWdTDo6qiEesaOAgU19r3eqXX6dUEe8G6tXaGNjgpRKWHJESidD5LQoShIHewqufyWLe6RZg1BZApDMSQHyvgGMzDiK2UTwllc4bVmxEPz4sq3+gTnU0x3rzL/mEMhfYIUWLPyZNCneQ2I X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93446c9b-58ce-493f-4817-08dbdab54fb3 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2023 08:34:06.7153 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0215 Subject: [FFmpeg-devel] [PATCH 03/11] avfilter/f_graphmonitor: Deduplicate outputs 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: 7IXw2i/3q5UN Signed-off-by: Andreas Rheinhardt --- libavfilter/f_graphmonitor.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index ce4153fc79..d2c0ae81bf 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -568,8 +568,6 @@ static av_cold void uninit(AVFilterContext *ctx) AVFILTER_DEFINE_CLASS_EXT(graphmonitor, "(a)graphmonitor", graphmonitor_options); -#if CONFIG_GRAPHMONITOR_FILTER - static const AVFilterPad graphmonitor_outputs[] = { { .name = "default", @@ -578,6 +576,8 @@ static const AVFilterPad graphmonitor_outputs[] = { }, }; +#if CONFIG_GRAPHMONITOR_FILTER + const AVFilter ff_vf_graphmonitor = { .name = "graphmonitor", .description = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."), @@ -596,14 +596,6 @@ const AVFilter ff_vf_graphmonitor = { #if CONFIG_AGRAPHMONITOR_FILTER -static const AVFilterPad agraphmonitor_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - const AVFilter ff_avf_agraphmonitor = { .name = "agraphmonitor", .description = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."), @@ -613,7 +605,7 @@ const AVFilter ff_avf_agraphmonitor = { .uninit = uninit, .activate = activate, FILTER_INPUTS(ff_audio_default_filterpad), - FILTER_OUTPUTS(agraphmonitor_outputs), + FILTER_OUTPUTS(graphmonitor_outputs), FILTER_QUERY_FUNC(query_formats), .process_command = ff_filter_process_command, };