From patchwork Wed Nov 1 08:35:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288310pzb; Wed, 1 Nov 2023 01:34:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEctNUpLD25O05/c2I3BrHD1J1Vn2dv1HmPLDtZnAaYpoDUTpTBHbxI3wVcrtV9ZVtsvcK1 X-Received: by 2002:a05:6402:1b0e:b0:53f:e49e:4be with SMTP id by14-20020a0564021b0e00b0053fe49e04bemr9550133edb.42.1698827679738; Wed, 01 Nov 2023 01:34: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 v23-20020a50a457000000b00543312678dcsi501235edb.625.2023.11.01.01.34.39; Wed, 01 Nov 2023 01:34: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=bJoYkt6y; 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 38FB768CD79; Wed, 1 Nov 2023 10:34:23 +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 6214B68CD49 for ; Wed, 1 Nov 2023 10:34:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E2V3KThJOGAund/dv8xbIdoawHlngMuIE/oWntmWvNkIaqu8q4HWkpsQCeDppyj+EPFqeXzkvmK7wMIZDgrBkySnDWOs2N33L1yDy8xp2ZvRJj/urqxKMDguOHTzJ6X3gSINBeGSH65pNLskpcopsAtD0zPGnAj+EdmP6I3uBKf8rcQqm3g5cUfb6b12VMl+QjHEdKb7EiCWFCuAv5n2ndN4Ao2CqbKDqIXVXh9N5Uh33/inV2lasAhMx/wFAfHbCAg5Y2Hb1M2jsp6A1yfNLMvrWnyYd/k6LH/k/DPxp6JGsM5Yta7tTYWC3UjRMRt3xIHOyZZUPCozGOB+tqRmgg== 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=F2SyVQZh+fewyeKIplxObEhNXBjk4oeUdk4iwjJeaIk=; b=KKD5jAVBXx1yRRD9Z1AA2aQLR3Zfbrsll+XqMwzCeRjUtm3FO4UiU+7Y8wD/cilHVs7lG/xxV4LFwNiQSmp/a71N3qXikYHRI6kQKDYbOrMTiHWe/PQkhKit+czqf7YfsD/jebkhW0RlqFnl5zQqOF/J5Z0kBYXeoCh2TB+vvdzhJ9IhGtDGnnrM/Gxd9JRUD2qcUdcOBrqjBmJ7cvs3IRa8DkZX5s1+z5+4/u6HlQq51SnMaGySdVqyiJAr92ibT2QJ6sVBLFLWaVuZpK+/3nEinO05E4KU/bfDI0RaAPyyurvDQlotrU7NMEU2sMnuyrwZbFKwrkJOZbCPzucpug== 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=F2SyVQZh+fewyeKIplxObEhNXBjk4oeUdk4iwjJeaIk=; b=bJoYkt6ypW2oWs/dR4KAEg2H2vaibKplCMGgDver1ZVcGpgsdDQUts00CR/G+QZIahBRE5E6AiQB0QKM8RRyc03JSuEe0FTA/ZwaB19bUQRcjmCYxLwFFnv08LdKxeZ1HjkbCJpOm+cJtVJAJHQ8tTJY6JqrFeLMnCbO0yl7MIvcJD0rZLU+te9D9OBGgyCOguUdXlzg/tumSNIL/VBNma/SyO/SfB5zOhfXQybDuY4+qO6NcFrxgrZdYnlKnwPJ1sREyd5uDmBBBOjQqoycjCCzTHEX+bvIqdmNaEZLd0EbkCBkcjL9kmMLSEef7TCwFgSlgUm4Yk02JJn5hLXbMw== 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:15 +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:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:06 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KhQjBfylrnuDrbHsgQvARKDZDlOYj/LZbRjKjkcZFvs=] 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-4-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: 5ba0eaef-a975-49b7-0f17-08dbdab554aa X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0p3t8+W0+/YVONnXm4bxxPb9h5pvbzDERHoQaSq3oK25Bz7PMtlFh5UILEV3iWZkY/JfbJrP35LC/ZHPm59VyjuD/Rt/gw5ZyZqr611lDdApsRYEGQ3nmFkDOvlgB/tCyeLgOs/RBTv7JqSYyuBHK1GW95m9gHOpGU/hcLxwTX7K/MaeO4YM182LIu3lWkso1vaVvP9h1Rwub8P/unJMBMcNahCCT+DyxT6mDayQ9LCo7XKLkcdjGg4H7Xlv9JKXfIqXEWYcQIqQeIPkz5Z9NUi8gR771AntihsqpFPM8JP31x14++TGwtSaS40MO+82YQOzkXaZWVzw5/Dkm/6XFdoof5CR5Uvcp9zAxrxmPMUqfDiS1Nd31ordofri2ovHj5C57w2438YG47THTunYVOY4OfCt9mfoGgKNzV1inc/3Z1lLft9jwTrM+e+y54gnHiTPXOsUQ9uvPnKPN43GIyzlRP4o3B+K9sefVO+v+5iY2XXv6JOHP7iXm0dE4c9HBJQPwiy8nd1vkaTLRpyd5pslxRWuiNORrGz7wzUsujbpLPIeJNnZp1DU/CMHOeXEaCVc9hJljGQBPxa2B32MfRp62A9fX2v3lv7ZcgIQiUHCBaZJXyxbJl95MJPAXX3Z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KNv2UMAcpocqlvcH4ccQbZZVA4lRWrCiHk/ufJiHlmtRCqbhmoTbn7fJ8i5UYyFF3xmsmAr0vydVcSW/buARYzeNUcEduig7vIyZ3Cldo45MRTqsgCNKQqPdQ3X43sUKjn11GTPupLdFInox3Cs9ALvQzJyqzMY4tCJ/C7pmT0LdKLwvmABv6mdNK9dcT21/P9PnfNA0Z7E/MceInUzWoui0BYefjVGTrXWLbVDNnGFBnCBgNVjLjxCSw4xJZQOKc80d/WQuLX+udIaK2dehXL7FaOqhNH3j7l8OUEa77rpkR/JJ/achs0cxtxpkdhNrH7roGzMSegHdU3vNCn+WoZQA1NVJZec4eagjYHGeyUU3Z4CbAUq5mLtOypw4nk05+dBLk9b5dr1RNm+D3iOgOJc7WBgTe9Cof/v/WCWKm2p7LpCkn99msKfPvVQyrre+ElaqC6dPaFsuM4DSANTMrlMGKj/C6wfcOYcBk/3vj+VmdnCTREsb7kBoD82RLdcvlNxj0ocZNerTEOC9FvHxZuYHr6q+fQ831DjFo1NxPUfCV+ipxmwDLLsWeUC1/0r0tThQx4Rup3AQvHnSoo9MmxwF2j+ayJ29+FUKFc3oRJEkvrjDvqdNxbkIiJMro3Joox4HufQWgtIiDffR08VLMpEYuxHZjj8vQHthu/Uw0634PKH7r2ymwr7/6zOwHBy9myG4Ym/ZNBOOy6k1yw/SuAouo6xLR2IiU1Rpdg7kAv7C7JgHyUSDqBjArGPivHZ8/vQ+XBwSYgiqjemk7Zw0dLs9LtId3QuxmyqQW0gQnfgUV9QAIMMeS9aXFW87FsSGU8PKslqXY678xxSqySNPRy2DoHVtL3mPrNVhhOBExViEFqRu9ugdt33B7PoMqgn1k5I/9JyKTDB3QxdyxNC/cLlhqTWwkfw+t/csJg6r+wGXp3e3oMg/WkJouY8TJ+NDrE0PxLK/T2gLs5bu9WkQ/fPXGUX3bRTvOkl6LV9kub1TUwUQtRpDJlGezQRiwqap/fWlMLGMoFu3Nh7NL8wTMmlh/Qf1lTRQdu86rKG2Gk9Rbgky6ecX/HVNL3mHF3X/FLgHrc5ELvjsWjVX8WbqMsncK/n4J4/oeNuw8/uVV0XCAc6lXKu4++L67si8tllLKqTqzqVX6Er/yQw0yoZAOXoKwiaCwhMOcIujPtI0EbEapEedc6sC+L3gB8qhRSROCPFFKsf+KuFpOYETtplBIw5V1TCFt8E8ybLQKNDSITcoP4sI2I5b+ESmXfvE3Vm9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ba0eaef-a975-49b7-0f17-08dbdab554aa 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:14.9629 (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 05/11] avfilter/vf_blend: 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: X5o3T0BuvGuk Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_blend.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 7100d9f372..ecabb78e61 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -378,6 +378,14 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return config_params(ctx); } +static const AVFilterPad blend_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_output, + }, +}; + #if CONFIG_BLEND_FILTER static int activate(AVFilterContext *ctx) @@ -396,14 +404,6 @@ static const AVFilterPad blend_inputs[] = { }, }; -static const AVFilterPad blend_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - const AVFilter ff_vf_blend = { .name = "blend", .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."), @@ -455,14 +455,6 @@ static const AVFilterPad tblend_inputs[] = { }, }; -static const AVFilterPad tblend_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - const AVFilter ff_vf_tblend = { .name = "tblend", .description = NULL_IF_CONFIG_SMALL("Blend successive frames."), @@ -471,7 +463,7 @@ const AVFilter ff_vf_tblend = { .init = init, .uninit = uninit, FILTER_INPUTS(tblend_inputs), - FILTER_OUTPUTS(tblend_outputs), + FILTER_OUTPUTS(blend_outputs), FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command,