From patchwork Wed Nov 1 08:34:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288019pzb; Wed, 1 Nov 2023 01:33:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrwMnlKVuvS2J+SVSbYQ3g6/5ZmieYlmEW0c1CYnaMDUopKT/t0f6eEDq3qvKDkMgSGnbI X-Received: by 2002:a17:906:81b:b0:9ae:5879:78dd with SMTP id e27-20020a170906081b00b009ae587978ddmr1590724ejd.1.1698827634948; Wed, 01 Nov 2023 01:33:54 -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 qf14-20020a1709077f0e00b009adec4bd976si1280653ejc.375.2023.11.01.01.33.24; Wed, 01 Nov 2023 01:33:54 -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=ppbQSjvI; 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 3717A68CC87; Wed, 1 Nov 2023 10:33:21 +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-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05F8D68CB57 for ; Wed, 1 Nov 2023 10:33:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QYORAnwv8zgOD/c77KZdmSOYhhpZ9g8j4dNI0dfeG82OiRjB7BccjcWfJHOdffxrfSTbKuKNDzLz0mErDN/JZKsExj/9/PZV2NK2xEaFRrxEOBrgC3j6AWmlZNHpubXBh7KvzxYcPbQBAWSGmVXdNULr5nHQUQAeV5LrhzP6wdru8MBRzUHiW09bGgWZmRXbaJoUNIJD+HRKjucRGmIVQnU0uE4E5NuyB5OSNu3PUY8OxKHNcTrzUMkW6HOaAs479KBcx4Kb/q9BIiwySSlrrZW+RZ9qO9Fi/m1oSCii7rR0JDf1FcrJ/xP3e3QrKGi90V97HcfKHTHCY97mG2+0QQ== 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=RMNMZZBFUbia6tUyVUE3Yw1Sg4EaIACKjEVxBIprxn4=; b=Fb6riHSycyinOtj3cFB37IQ9h9I+NARzp/kbpJVe7fz6ZpyoTJmfbY7jDdJmZfdXIegXphwXkYKswfycUDnkWEDKIvuayKlkp5WwrZo1D4rvlQw5YeorLbNw3BIwsTxWsab6oyMNWZhXuZvwH2JGlq+OwhQkVvV1SFzE+1vi7M3F8hpFIGJ4BhXwj3pymKV0JtlPryGqQ2/cXlktL749BJMT23IUUi0Q+C5lRponrYOGSkRhPSubUt6hiesKjlInEm/0gD1jVeA1FhgK3JMb9FGuivkwL54QtFRt6QUCs/HKkGkV9/JF7HbnwGYe+0ziw0MddLTZlXH6JssQkaGxiA== 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=RMNMZZBFUbia6tUyVUE3Yw1Sg4EaIACKjEVxBIprxn4=; b=ppbQSjvIxDSvRenK7hVKhCx7t+4xVs58/ylquR4E+EMpSYI4DJ/F41/mYYnk72fLYXkAvNF++FbsxAK+2KGvxwR0jNgbQWeg0N3xaM0ioGSaBGfBrzUy4KdbC4/4UxNXcvGhs9oPm7JshOYB7P8KNBqL77MhofVsvCv28efEob42rmCDnwTsjkyWk+VQOdFz0iFcCUOlNXyElfM8gFJpzrmXrE+4ZdC7rCuCgLrrk/YnXlrx4jfzaW4ArZphnvbujX1bpE570/RN9IvraF7TLzVvDSYlX+58//IDE5LUj8Z5JjEbpC4PESzOtkA0BAkW0YrQMtqQBO97gZQJvlENMA== 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:33:12 +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:33:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:34:13 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [cepN8cVyLcQ7OgSdZxRe4GpZaOm3d0BqWBlgOuZFQAw=] X-ClientProxiedBy: ZR0P278CA0093.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::8) To GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) X-Microsoft-Original-Message-ID: <20231101083423.3398491-1-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: b2950e43-676e-42bc-e92d-08dbdab52e3c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y+D7mhTW/tWJJczycRn7Qywc1RqwERtUiYIUosYJv8SEq8pL1rovd5gfTE+4+NaSDvtwxEP77Y6afuASPMLwtbRF4GId6UtSOL9AxhyBTwhxVvjuKy7FW9/ipSAQPf6AicmaSaIuvTg/kibWHMApRYPI6UcumC7s3wCfrz0itcCTb8L4MqwjYdTyyVhZ0yoa9ABeoBFeGIXSbemY3AgjhJ7IQ/B2LlGzD63+PCJdR7HH4kCjxtwy7ujuYeggLu+LWtk7kJLocMNSk9dn/qMR8MXDnGmBkQvf/lhVghKAE/qbFNvJngd519CS11lItnGtQNYrt5gIMbxVliqHLqLxFHKqTlwXC97UrBloIzaUL3mt9Ykt+UOhu1xqxng5M5g/YvOFTmalj9Edbmodg9WBBpF8HfOY/BDuHL4cZZ4se5KYDnWIUTIhMDxxDWo8J1ws1iZq5lu/AETDMbeggiHTbwGG2ZRtb79VikoQrenlZVTyBE9y/s6h0nIyUpQQvG6u9UARitN60LKMAzYWPR7faeJuKoFS88m6l7vUI9sutfL7abYOyVVVk4pd4dslsDuck6WtUdUOJ80coolDaapeORINbkdWoN9AOrUKpXI1LDMzDNJiWQyPDBc/RSn6CljP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IXHByvJ/UilTwIHtyrPjwdOzREboRjmg7c3itjUBVL6/im6plrs/71AK4dBOabDPrskwB7+ZVWV+tgqz2GVroQu41cngMYKr9xt6J4uYqgERefPHocrq7gzHTI3b1M+nxfd1Km1TmUlJlWpk7LdJFyz0hetoY//YStZtDa2k3mM/XISnsE/sSE3RsgdaWvQH/ZsbKupHrcthvFzJ3IBVptRTsu2NlByRWUswbXKk5kQY5WcI0fuTFERyhPEEm61EqrnFOX9/+/f/Znpv/EmIw5mQDaOc8iFsf27gVdzluHab8QTyLRwy4RRrR6aTnm5amzUK6hFbIn9lwIrhYV5cUWu/x6scDW3dpBfQZNcu6aPCeOxUL4bM2id/BA4VeDyjpEJ1kfG23w71l8U4vUMaKr/AxU/5hoHzfEGO/i1B+eZMXZhaI4nfKoATf5vmvIFP+ufZso9kCKzEy0JwbhOCelpGXCXHmfW8lVGQPwwRIHqYTbR9L+AMXUCLVWtN+kaSb/p/AqBmgauWTkmWdDXhxwqjpF9zSw2CozAHEmUSBpZv5mAV8uaQbkDqgxak+PRl/Yyda8IymPnF8HfclE+WhAaeIWsAZwL8omdiOS0Yf0XuIar+bRFn4EYnVM95h759Yk4de8nH5m19GuLsf6aCqpqSaViL5bojm/LdSaMC0qbSTTCscHnH4uoTi5JqS9+/WpBo6aD+8M+gbQnXnisDYaUHPWGP+A6B0ZPlX3qEje7+MkMKOtk/q+bbfC6et6pTlRVo5xRiMvZJ3el6LUGHoF1vrLTEEHWGnGZkC55uG4dcABhR7p7DiEWB4l0Eu2i47UF/XoC+2zObvPR/KvoW2XwAJym/0XGIrxl3+0Cl00v89XqY7JQcc9YUxG8oUo9NNUy2EsybDlXsnXsKlDRdm4uQjMUC8t+us4tclV/gJZ4WLf2csbJAPkmlV8TNvDkO1OaNd5o/19xsI9P4TryV55kRm7G7G9EhV3fSrhbL6Oy178poI5JMmTedDaiQEpXjb2tbulx6WalhRwRyR4BK6gZtZ0KGsbBdAFMUlyPQWN2Po7n8DJ9G7mcqeDxjx1Cl/lqNqnLHWFt1xV2iYZwM9O4/vQTy8zHKoeiIaebHt7StpAYeXw90Rt1+ilST1Tfp91jdLTRpjQvp7cTcMscTxtlyLVBaJkRe2yyTK7SzbQtqNCkwr9F4kjeNSnZSFIpPMw3g7NnTxQUeY7ZQ84NrF+RfEm60wTqoCGu8LTyDdfbEykdaSYcVUlYLwHey8nES X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2950e43-676e-42bc-e92d-08dbdab52e3c 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:33:12.2722 (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 01/11] avcodec/aactab: Deduplicate swb_offset_960 tabs 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: L1t3Fu5NQr8D swb_offset_960_48 and swb_offset_960_32 coincide. Signed-off-by: Andreas Rheinhardt --- libavcodec/aactab.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index d20ac56a3f..63a478f33f 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -1331,14 +1331,7 @@ static const uint16_t swb_offset_960_48[] = 672, 704, 736, 768, 800, 832, 864, 896, 928, 960 }; -static const uint16_t swb_offset_960_32[] = -{ - 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, - 40, 48, 56, 64, 72, 80, 88, 96, 108, 120, - 132, 144, 160, 176, 196, 216, 240, 264, 292, 320, - 352, 384, 416, 448, 480, 512, 544, 576, 608, 640, - 672, 704, 736, 768, 800, 832, 864, 896, 928, 960 -}; +#define swb_offset_960_32 swb_offset_960_48 static const uint16_t swb_offset_960_24[] = { From patchwork Wed Nov 1 08:35:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288121pzb; Wed, 1 Nov 2023 01:34:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEM7HCe0/oxNfPUpXdgrkUUJLc5R+f7yhD4T0WLWUcKBpp/oXR0bFT6GQUS3EVpF7PNaJEM X-Received: by 2002:a50:9f82:0:b0:53d:e139:64a5 with SMTP id c2-20020a509f82000000b0053de13964a5mr14487965edf.27.1698827650358; Wed, 01 Nov 2023 01:34: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 b33-20020a509f24000000b0053e308abea4si537551edf.640.2023.11.01.01.34.09; Wed, 01 Nov 2023 01:34: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=ojd3QZw1; 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 9777F68CD34; Wed, 1 Nov 2023 10:34:07 +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-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F92168C85E for ; Wed, 1 Nov 2023 10:34:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=agUVpyjPbkvSMEICqp0z1plLA9hwAKshHlKJ9+wqqfpXnhwveNQMleR73EDEHxFtE0EiHWg5EAgPCuNqw4gePx4FPdej9fwLTmQ8JK9VoFFTygfrJ6qCXht/9ht2ChWXeDuL5rFxE1uxEWX+V5AqvMPsln+G3/GzyCurxZg9rwB0yev0/Vx6b2jai2QsCaJRneJFJzmiZY9c5uEWiD95vLCGHaHpuiepzv0KeMapCbob52tSUir2Db+82IV5H047/SHa7hs04vVxdODYwAg2uh/jR3C0/H/6KS5ymjKcdg4GBpIqp9YRUS8jhGattCAoUxvyegKZ7JwhzsjC/aviyg== 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=/G4VrCSeplVKnm2sPnvwryXugrLw3RtP0bCz0QiJdow=; b=nWGoMAgUSa20X/iFJE1iWih9afa1wY5fr4ylsHHpxjdy4l5HG/H/Ak/mI7L7xyfEI2eIg0hMUgVIAVlvlAkqP4JUUqX6ufOpb4Zx1J7LLY8nYsIC0ASklVnl/SHfg3ml+YCxogf3uFasz22zb0A1yIY9JwEVVGl5/aNBm/6pW7MYf0MvZEp0cR43uDg7VqqSn2CnYuMOvuY7c7BCG31Gj9MpW14WsZpXLI4+fbsiGkDSDdEo+qzsDqDVGQ3byfeyUIPNlGMsVkou56o/vo+TVTZAIAMy22nzNGyitxN0+qokDsziew8KK5twxzov3wVRYDj5eIdkdOPjLufeoTCceg== 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=/G4VrCSeplVKnm2sPnvwryXugrLw3RtP0bCz0QiJdow=; b=ojd3QZw1U9TD2wsbzu0jaFd/sTnYBNJR984m/uZWsjVdRxXw2G6RwAJe6n49I1Fk71tn3NK6xDjC2WAOcZZCf/KAWNnTVZ6yr1yNAC3L4bhL7XAFZJ2TF092TeLOfjDnoBNhhac/oHo2qywugIH91QrcNUIXynWjce5GfQL9ieG0/rJyXrU20j/Dp5cRyr+bmSbUphvCQ6CX5ODct9miktJWaZyjpJEG02HtudJWfpxaTYvq8hcgqkn+enb17h/IrOGmM/LsoQBRuwoFTXjkLurvFmr8rU3lXTeoXptV9Hlq45813vQNR6bQX7Z7joLTBtTPXpHIBc3KH4TMab/yXg== 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:33:59 +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:33:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:03 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nOPmDRXSP6d3kp/E2F9gSnuxW4WvK2XBzVhpLLounXQ=] 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-1-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: 8b5a85c5-3c50-4b33-6986-08dbdab54b63 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PWzAKLW0p9MyIuTlrKvB/JPxFihTDhe4ftTCvqikQPCwAUrwP1jVxcrCg0Oaknq3nH3LPbNi2ZuRwz0kNX13bxhSCN1vsV/BdD/CEGGKVjOp4jkTJV/w36T1PJm7c/4ElxxRMtmSPq4no2je3En+kXXj9HDHGioYVCc+eFg8W9YDbbohg6V8tU1jkrYWtpd5m4mez0RIkyMnnWhc+Vve0g/lPGK03nby8h4hlgb0hDC9aZJUjLMkmAhuQsmo1r2CMkyhDE9tlHtB2MSHK7Znv+fXgaNWfmtV/omTSElHX3NDoHqYZFq3Lep3epMbelrWOrvvLFZibPs34v4p2T2ByxrajfjiZsUUarkK5dQXvP6/PADXLkZgrAATeCGF4PXO0o9kTuEm9zoYBTYcZk+Qt3EmDSBhwJrUbawLDZqfl/Z9y9paLTfyPUQQysM8RgnViVUyg7EXXFckk9bf/wAI+hcrSPhgOGuBZrv0mTpRqzQip0P7isEYJsSxL+5PTj1hVpnOz+QaMDIgcnNZDiFnR+Mb0jWd5Shz/u1gHJsZYtVSrRiXlQUpBatNd2nBcE8BElGLfCndj/c8QaO7fZKfikeUJvpHhSkhyEfrx3KMsAWTOaix5VatH4C/XYR9B+lu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rLzJUItxLA33bQGeh04+BLIGjbn51pTr44V/4+HQsO37O6xPtYkg+BGY5VR5HdtNh3mqfoU4fMKIauXZe5+5CyJReFTxy4PF4p20W3E2Fgtejvxg0BHbzMM/k+lh9awhen9dHyY6WvnlPeCq6Ctt07Prm5UxEhMDJhFWshdgyK9ljI8I6vSxG0ZVuQi82GwU0sL23NOv1J5D3QkK9Rpk0TulWFIMGH0gOKHTOED+dfelyjJsN+/BH0aJrpl7LDxhaCA9lv2WFJNO24iCGcNyBhZX+Ecw7Tt33HI9AiJHWDFyXDk4DlSJDCpjsj08HY0k+2i+t1jmphsjQUzWcjdsLsMrX7YWTklViQtHS3OHTbkfUvtPWpDeM9Ry05k4SPQMJM9H0zuvFk+h2fMLcJJU+l/d/gjxRRbCQ/CyGbidSg+dTMuuPtkivABvLKRuyZv06wldgPsfk6/Kv2ZIXTuXpPEpz9B9dLqSYtYw/5/x/rHc7XsYI3gC4qTOz47KIlTnNAxwghfWrvcBU2CyYdVoUNqPgQ+d7yODBatv1A6g7nG0YYcGGXx1eysebu1XvMdLRCCtBTJsFKfNZGLnYPHgKzdUw+g58k5ckVF+vZucEO3z+16mvwpjZQ8MAVCs96ceo9vEjpUGNtNUAzgGgf5I3ozuymKiTthUeV66j8IKmav9MR/9fKwITdZh+lSbyb+CDQKT88GOUloKNFedkBwbjpztH5XOs2YyG6pHa7AP3SoOIJuXAeOj7GZHrVQ3yPWJkocPs3jdN2EaQ4UmXixu95eWUdWfjGOFW1uiHZztz3FielhBNNEzQMC3uOOwJX0EqKqYNTaqEZKm/I+G2gB2KvpCweLFlSQa786gdqZQSFMGP39o3+e7QIAT7Hr5/p8FlmaUcrYXYtfHB2ZzoErJUYoiSCWPGXBuycHGsBonTd8BC4BXS1TzepQ6MXTKb6/xq9ynyY4rTjOt9ByFfWMm8LBEgcPjvYR4twF7ICmCX0+YkUSC0Jm8blsHwK3SYorpM1b91wachtWGw2uQfbAMbZnX94NGRyRPrLv1S9/WleIEAmhetswmW6JymPpCYgvzAF1oey476brlZG7KgJ1ajf7SC3E+QNS16uDg44UUPh5eAMUP4nsFgavlSyPFaBVDH+ZoRp9ss4MiKFabPP6ZU00+umTQPdy20IyBs6HUkqllUWC+XHOUxrl6ywP5SnHrRb7xGY5y04jXqHzFkkdG4fsOlU3rBD8dh2d7QpTDuvO5XQnkA586BCx4DPQV2BjH X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b5a85c5-3c50-4b33-6986-08dbdab54b63 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:33:59.5251 (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 02/11] avfilter/f_drawgraph: 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: ndkk0mWayXiZ Signed-off-by: Andreas Rheinhardt --- libavfilter/f_drawgraph.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index d29a7fb60a..d53598ee15 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -454,22 +454,22 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->values[3]); } -#if CONFIG_DRAWGRAPH_FILTER - -static const AVFilterPad drawgraph_inputs[] = { +static const AVFilterPad drawgraph_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, + .config_props = config_output, + .request_frame = request_frame, }, }; -static const AVFilterPad drawgraph_outputs[] = { +#if CONFIG_DRAWGRAPH_FILTER + +static const AVFilterPad drawgraph_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - .request_frame = request_frame, + .filter_frame = filter_frame, }, }; @@ -497,15 +497,6 @@ static const AVFilterPad adrawgraph_inputs[] = { }, }; -static const AVFilterPad adrawgraph_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - .request_frame = request_frame, - }, -}; - const AVFilter ff_avf_adrawgraph = { .name = "adrawgraph", .description = NULL_IF_CONFIG_SMALL("Draw a graph using input audio metadata."), @@ -514,7 +505,7 @@ const AVFilter ff_avf_adrawgraph = { .init = init, .uninit = uninit, FILTER_INPUTS(adrawgraph_inputs), - FILTER_OUTPUTS(adrawgraph_outputs), + FILTER_OUTPUTS(drawgraph_outputs), FILTER_QUERY_FUNC(query_formats), }; #endif // CONFIG_ADRAWGRAPH_FILTER 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, }; From patchwork Wed Nov 1 08:35:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44463 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288311pzb; Wed, 1 Nov 2023 01:34:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxOhPhPJOLGvn/9rF2GWBAD14klmyaD0Yups1xzc4HM9Eh/Gvu+KsMRc0MOSf5KLfz1trj X-Received: by 2002:a17:906:4e92:b0:9c5:64f2:eaba with SMTP id v18-20020a1709064e9200b009c564f2eabamr977973eju.53.1698827679647; 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 u16-20020a170906109000b00992f8116abdsi1314136eju.480.2023.11.01.01.34.29; 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=Tt5a4Zv0; 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 25BC868CD65; Wed, 1 Nov 2023 10:34:22 +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 2924B68CD49 for ; Wed, 1 Nov 2023 10:34:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QfvFOy5WBQlGSnInPdtZgzOMsONMJNY4D8Ib15vXXRfWfnGiyYtJ4Oj0QgoMYU353ZycUaLZdb6qM8EuO4urMYi9mcwSAXlOxo2GEigV4jV78B7RmOYm8L78SEKxoSU295uaKJ7P6UYjzjtus7Y76s7MUyKdv91KmjEselhr1ATTouuqrQGzobt3ynPxxkNDHUuAvnW9YQuKJQKOpcB7OvlKxwV8Qc8YoGHST6rCCWdUHe46RZVqQg10Ruh69U7px2gc0tGvReJEpb6Lw9sCLbQVzZzR7yv+FxyvU365c5YlU1MuAamNs/94p+Wnpu2pCSgi2NsuE/pOiTseLTazpA== 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=qD7QqskOdWtki6KyoKqr4en5rZfMIASYM7+04HAOly0=; b=VNUwwV2ut8+PMH+LQe20spRcHH1rd08CFZqKepvD3E9FRUYLNVqAfzwyhXYGftaae+8WmZ90wOG5vkGP5xeMmtiJqIotcJRXy24zQnThZdlN0qdmF/XnBMgY5xPCPdxlSpEbhTD474KWRpRH1c0b5sR8SAnr5H71MBGimFfiyRypS1hwZdhweE+gJYKYssKYkK4CLVweboHLaSGTlIb4U7GKvq71GQPs/TGrVItvYIBn0bb61xpLR6NjRAAcjw4N7uTglFxK8RQtNLPaDT15T3JkEohvuQT1vhMZAGLZYWuqJyuQNaMea4RcuaxaOtF8gSS1maeOjRBVyCYjyJak7A== 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=qD7QqskOdWtki6KyoKqr4en5rZfMIASYM7+04HAOly0=; b=Tt5a4Zv0dUk2Dj514wOmlX4DZRwRil2PjmO/8t8su4jId498LuYoFlT/GiIi3ucTj7LkwHUcuneKIB2qCCngFA5HB0afPLZ4SSA6YXKvrdkdbW9WY5D+esNxDIpAKVrOtbYkPHuGVzPvG4Ob+e7X2zEBiJGN4RLE4fua77OTz7WU8iGBmUslCezhHWD2F1PMR+ekIgA/LXqIAm8L4sYOTrfo/AS2CAjL2vDfJvFyUIH7LOVVizki+zW2hxSYKnk7aGxCS/KrIvF55cRavxYLoULEuTZFhHYC3l9QoENfwQAN9Tb8af1n1ugg9ckZfgyW1BE9PfNylEd9NsOVvu3G7A== 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:09 +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:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:05 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ZX8YUTOFKexFar8HkXzRSHXw2WPVvomTfjRMMYaxoGo=] 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-3-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: fd0c4437-a4d6-459a-032d-08dbdab550b0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oH7mFiUoRvNMpusVv2Jb4n/8ruf0PBOO2n6XgL6gayBwQMFSSCeCHWIArKG+ypF9i6OIvBbmF+rsrP9aGCnqFmqIi7SMKbmU+EwuJpuglD+OiCv3spXYE7BYKxY8C1/LUBS29OYXFDx0+wmdgrfz/IBLOBN3+U245qpx4YE5ZiSOmdGknWJVqd2n5of5JCsSHcll8ee51LYV3KrFh1/erzqpMoJP4N0EW9ZsAy3ZR6AAEhQbjdy/jsB0hI6fVErMbbgGOdEhfR1IXIw5iDRqSprc0fDSq3gr1PhtYtCIEPlEZFxo6qsuKOHEa38/cht7BlLrVvZOUVTX9enAY21WhNoT0EhtHyRs0K5lOWF3msHf7AkBpWqELsx9gJoQt/K6OHa3MS9Wt1hXwvqhyQgjobgqBzZzsnfVqsgBM0SyBgMXkfJ4tVpW6SWm34OesxDWIl7/M02be3Og5MMFfd6kp1IB1OnGLfecT1WnEZYPewexTpS8SoT47aq//SfTbEfm/IOAxHP1jncq6I7wi67UjJRsN2LBufh6sjycGlnonRPqdDlvJlqa9Al/2kgQX3TvJjTKvqygQc/0uN2YtuVqiXY35tH7CGQWCSmV4BAI+yelbI9hMVX4ChJkG2WCD22B X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fFbMXUTk2o4SKUlsOivF8GW/G3tx8HVKJqUB+RXiIbxyVj8K5bLmLhH6pmWrlYonI4wvqchDPF51yjZ97mt7HZ964WhKDmFDva3KaxICbR5Q/YsHhLgOPbayGmI7O0tO+13SU/cJE+/9jJCI7JBVkMhF7Yur95nz5Yqz+cHtnAPA+/xjFpYmWnZHJTIQ4Jy3c6RmBFDtJHluVvB1SVL61Qvow786Hylqtql5ksR6Jio2Cy1I1fTJUp/PBlvi7IzKIVWCuOUaUxUpcf3nzTHdDP3q68kReUlpClCVHiNXTFU5rT90hlts75bgjBQduuSMTjCBDuGfa3pkrxPa2HNhQJQ3CzC+eyyme+VI5kMkhfrv3F7EyF14xurUcyxZj3/f7hTW7a44KzFg06f+E7pQHKpNp8kJv9BPEXCRrEPri2mKWBPz+/VERUnk3heJo4UvkphWvnyy6AXudT2cob4pSQFtgtq4ES3joZbgDpzDvnQsjomMYIV7eU14qZngyd8sZZNxTD0Uuil3oW5KokEBInwftWQ6vYoUAbBehrJQPpd6GQ1Q1i4tA30Wx1SluqykRiOmlpkaKIykIMv7yt34NgKXp6xf+cYSR/P2Pq0zfuMu0TZFwyJcxO3SII5MQZ9DCdeorcsO4mixG34eLSvyvKIbkvBReusiv6IS0b6bbUkD6A88q9jUAPK9bbn+Xa/XAenPSbvttsTGaKU13WwiGNIqrMdR/1++bznV9yCVT5B3jiY/l2z2fkZZoHjPgAiDkrqR6kBMnqYdBfrXmNL7RdlyB21rNUiuQvtPIX3sQru3F3IvKBzoWIwoLkSGg/Q3zDLcOaXl13hvcgo8eTmWtu2+q4S9yPAlClfJTkdmrLu/3TnhTFVCyTgMizRmx+pu/7WGmsCNeUI2EkhV6mHhdreoq43E+wtl/ZkQeZEJaMSErPHbLE3uBLeYAb8bzT9qh1+3c1VTHLleoAYqZgfqu9tDz3z3vsQI3VDQN9gtkask8KAYcmnvXicuAw1pT2QLg769/NlK0+2l5Kz+7QFyzkV/d7qXjbcZyBtbSBOVYEzslhRxF6tSkkbIIwa1D7wZ6Dy81ZnWUBo8FFb5ifl+HgX9baGu0eL2Rv/maQtUgrwW2NYbBOUDrJCCRfnZV2CdBSQFRzfLtGXv1F6LaYGploD4fypTgJPjKVCDB+YPuiPw9RNpydlZ0xMOTfGqzC2vddHWYKa7PGIgouMm5/5po62yjS/hydpiuA0Qp1hYYK9NG+IEDrfdFDUHGZQlcbOk X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd0c4437-a4d6-459a-032d-08dbdab550b0 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:08.3220 (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 04/11] avfilter/vf_aspect: Deduplicate inputs 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: pRqPbbYsnws8 Also avoid using the avfilter-prefix for static objects. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_aspect.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index b453de70c5..129ae19d6d 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -127,6 +127,14 @@ static int get_aspect_ratio(AVFilterLink *inlink, AVRational *aspect_ratio) return 0; } +static const AVFilterPad aspect_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + }, +}; + #if CONFIG_SETDAR_FILTER static int setdar_config_props(AVFilterLink *outlink) @@ -171,14 +179,6 @@ static const AVOption setdar_options[] = { AVFILTER_DEFINE_CLASS(setdar); -static const AVFilterPad avfilter_vf_setdar_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, - }, -}; - static const AVFilterPad avfilter_vf_setdar_outputs[] = { { .name = "default", @@ -193,7 +193,7 @@ const AVFilter ff_vf_setdar = { .priv_size = sizeof(AspectContext), .priv_class = &setdar_class, .flags = AVFILTER_FLAG_METADATA_ONLY, - FILTER_INPUTS(avfilter_vf_setdar_inputs), + FILTER_INPUTS(aspect_inputs), FILTER_OUTPUTS(avfilter_vf_setdar_outputs), }; @@ -234,14 +234,6 @@ static const AVOption setsar_options[] = { AVFILTER_DEFINE_CLASS(setsar); -static const AVFilterPad avfilter_vf_setsar_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, - }, -}; - static const AVFilterPad avfilter_vf_setsar_outputs[] = { { .name = "default", @@ -256,7 +248,7 @@ const AVFilter ff_vf_setsar = { .priv_size = sizeof(AspectContext), .priv_class = &setsar_class, .flags = AVFILTER_FLAG_METADATA_ONLY, - FILTER_INPUTS(avfilter_vf_setsar_inputs), + FILTER_INPUTS(aspect_inputs), FILTER_OUTPUTS(avfilter_vf_setsar_outputs), }; 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, From patchwork Wed Nov 1 08:35:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288362pzb; Wed, 1 Nov 2023 01:34:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESnY0om++uIY9//IFjZz1253EchFqUL/cWjz59lEVMjUEfO26euIg3Z4iqJJLe5EaO4wPd X-Received: by 2002:a50:9319:0:b0:53e:ae04:40ec with SMTP id m25-20020a509319000000b0053eae0440ecmr4720386eda.18.1698827689050; Wed, 01 Nov 2023 01:34: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 c18-20020a05640227d200b0054395969fdfsi506593ede.444.2023.11.01.01.34.48; Wed, 01 Nov 2023 01:34: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=OI2y4+x3; 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 280E668CDA3; Wed, 1 Nov 2023 10:34:24 +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 895CB68CD79 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=lrwQ5jaPLYw8grQ9kSNgeAqycVxP4hEUOdOY8rJ0RnQ4E3hQB3K0gUeNok9ZcrAYrykGaoTBnyaXNZzWoZgp+D0qEZZhnYV6m2uOQI8flfLfVj9KhZQiaxi3g1dt4F2qZk+fa6DcQA5Hu4XrQM1oL3gdcV9a7DD+eUrIepAYABcWt+THGQ3/WdXBrV0iKW3eahiFYL8xMBGvoJkCOelEnSShkH+dzQZoQ6C2dRBXfcYeejNw2uwkgehekwy+up48RqvASsSU/2LpDD51rPK4JqB1FlceF0M21lGH0rW9ApYawmvBllcEqzHXMzUHj/qwS/6YIdq9fctPg5WvlTX82w== 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=/4a4qjk0RWexh/h8aw4/PDy2wan6SNj8jewNXWMk6K0=; b=ajton/rUxFprtwBbywNq8HBR/tOalV2r8VLiiVgvm/gk3V0yp8cKZub9BImnOy43cyEhUMPOrKDra9OwAvTklamflfoRAwhPyYTUH07OBJ2jBa+eZOUV8GKcNmGJnGlelqtFFGCaAiJ+C7x1EPCR8gMsVowTUS6s7MPZApybtTcANUrcVubvudQZOgMa4CMBcNTbH9mvOgI95RcJq4xsQA7qCoRljDpegPxB+F7LHRghtSXDJk2JothHUWhZcgoGpGR08ol8s8O1egjGxpdBwacC3pzPD1f0mZYGYHvDlmPmFKEuCTKA2Uz/LBicJ/xhNbekX04xYBeGBxuA9jAIVg== 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=/4a4qjk0RWexh/h8aw4/PDy2wan6SNj8jewNXWMk6K0=; b=OI2y4+x3EvkxT/x8UoqJSHFfGZGM0mM6bPqwvkwtq5S0Ad1pFV1LW9fOpOD//K36X3pwGGTo9vzgWr9t3DIlhPwB1/eHJPC1yjLfiPGQSWtrCe058gSidEgxZ6OIJ1BBONxk91zMqOpYL6gppIdgWMdj6j/t55wQGZQnL0n8WtXpsF3aqTNUOGE5ZvvpAalvwCPTF+hUlvDLbyOOSM4ZkDBvuWkc3y5RI+riZrGii4DehehdTxpHqO1dfqAHDNwv9hoMWpKTX9u1Ovp1KwU8olNrsTKtaVfTnd5rHr2+yeDGkOxxXhPEgMFjNDRR+XhZUJOxZVnAfn+mAu/4tVzHjw== 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:16 +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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:07 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Jp51XgbrNNpZOc8+ZAPhowNupDBLMcUiOu4wtxtnwVQ=] 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-5-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: 606ef577-0500-4bfa-a3fb-08dbdab55561 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4bly44c+t0104kiH/soThbrI69EUBVtadLfT2LNF45hByKNFmTiml9af/y1z/kH08HB3KpzIB9SeV9UkVHRdMULAj8Y5hR+Zez2y7CbU9kzaVxRU78huQ3rD9B4Dowjt5q+vvgM2Zt4o/4WAX1qb58uTBUUVLGEXRa0ETwYY4H5hTb1THTtK4gpEWaCk+6qyOE5xZzIqGvlDFx9qkPc7slhJj+WFvuh+ibw+o1morrGF8dpvKDvnLDO53D6e5829SgIExoO+e+ur9uXYqnA6LXLDv0+Lkdu9rNibhRUSYeVnYihi9/ZKRL6m12uIR3c+XNs+aLs5RRvNJ/RavoR4/lSLvPoLh1WRKsngWEJw1NMBQ+SIIs9zpNv9WYfaYqDeOrXGK/zCjLWVhGI/EhmkHkPwEbLGKRwg5yycjkqiclYGx1SdxLjOw5P4CdcsBmnDrVg0CqqKfuaPyWPeKq/PTNLlVxohYlrTL0u40wOmTA2v6f7CTgus+KASDvrKudMRrbRUa9wLxcwnYu7hKB1vN8oNhlBvfbpP603CFtnXknOT4UNquS/iEAdVnu1vC8Cmin3KHRNWKw63WiZoAvhsq/kQc/aRgMOkWe9dPyYtQ94/oRGl3PrIF7INLNhKwSmo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7EVBzX/VRCN1ONqDvYi6v7gy5cl2Zv5EQWl1YaK6+lC0ULNRz0yjOhl74JqQpjzkC6ZANcf73UR0lILgHnDyo7+2bJoz7wJzaboyaa23Oi9l/ef0Ckb3PJ8+9lqMrWEb/4zK6GAvEH6fx8BfP9Atv8SW3KPr4iKE2gB3I6LMk0AEGIBx580tuaCu9Rm0gOXCmDf7hlce+Oz4oNfNe8MyK0kMzXubYJcBI4MlCiGTd94Y7o+C5eRrV/gv8PwvFEifVkLxVoyL4MEiGt1TK1yTVzdlj0vGQ5+3G+T9lCpe1mhCNXZMhhnSjduf31CLQumOslQblauvukTycaONPzuCuiSC9dQqzeANMaKgrA34GxDEVB8LJmgk6ywGST50+FaravfOTYq/156LyuTX0Hu6yHVUFFlKoIRY2oU6czzbpM0EFpg8+mCCSaESi03KwGy8VzZIefCe30pQxu1WMBN6RXyVWrsKDG+NVj20/6TTpIxqO8erC0ebLt8tFD82AY4wbOkHI4lLOy65ioWJDd3AnCwWN8bLr43enL2mPt+nIwohXkKv87kKyCXsguc59hcAqNn6Al3jaoevzczdcT8WK1dKEkmVvs0HvHQE5AxP4PV0ulRAEIyx+fF8xEvgF726WfRu0PJP6ZDM3yVOjWTUZcygwbqd/YQmfGsth+7QKKDDdrN2W24aFAl7TrJTOeGJ4I6f6EYdGW/RsO9JEyy/6ZeyBjNSuwfrlJLX9wrdl2Q0eMHJSpY7G9KC/JwEUmxJIhwveBL7crX5v+bULYQ4EQEr1DZbkJN2NKKe4K+7svWHjZYZt9rjw+X5kNSkD+Eiq/C28pN3ezEgL7ThvMNQh1uVa76fk3zknQhxP1imPHTJ1qjOdoKP6V8ESd4GoFICRlsRim2vDwup2l6MPtJH7zInhF/0dnlao4BUWfD0zXCokNUw5TKUsiypI4v7X7XhSHgTO7gPmK9qzqQCi1crsU1/etuLEfCY6cnHEJQcVHU354Bl6toW5VPJ+NtDrP3NLJcya6+hs2aKJQNglG0Ht92BTkkCV4iAR+/HrsdGyVVxbqTGyjFVpU5FQmnBeKx+aAU8Wzk3xanNSLyhUMP4PILxLDUhalrHr/An9s4xcHrGgkcua1i0Fy+BjUPTYxXCNGl4oygNiw5voq5DcJgoHQkRFFxPOCojGyP5oG5RM5Z9eRmEKkFY6jcUTShrBMs+bthNhkBmV3INUJzqM4E/4R1Mu0YlOYmLlMLEh9hvahC49WWgSaDs4xidV/u3Zuhi X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 606ef577-0500-4bfa-a3fb-08dbdab55561 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:16.1697 (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 06/11] avfilter/vf_chromakey: Deduplicate inputs and 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: as9LIEWLkVDP Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_chromakey.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index c204a58328..9c0918bb4d 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -323,7 +323,7 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return config_output(ctx->outputs[0]); } -static const AVFilterPad chromakey_inputs[] = { +static const AVFilterPad inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -333,7 +333,7 @@ static const AVFilterPad chromakey_inputs[] = { }, }; -static const AVFilterPad chromakey_outputs[] = { +static const AVFilterPad outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -370,8 +370,8 @@ const AVFilter ff_vf_chromakey = { .description = NULL_IF_CONFIG_SMALL("Turns a certain color into transparency. Operates on YUV colors."), .priv_size = sizeof(ChromakeyContext), .priv_class = &chromakey_class, - FILTER_INPUTS(chromakey_inputs), - FILTER_OUTPUTS(chromakey_outputs), + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(chromakey_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, @@ -385,24 +385,6 @@ static const AVOption chromahold_options[] = { { NULL } }; -static const AVFilterPad chromahold_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .flags = AVFILTERPAD_FLAG_NEEDS_WRITABLE, - .filter_frame = filter_frame, - .config_props = config_input, - }, -}; - -static const AVFilterPad chromahold_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - static const enum AVPixelFormat hold_pixel_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, @@ -429,8 +411,8 @@ const AVFilter ff_vf_chromahold = { .description = NULL_IF_CONFIG_SMALL("Turns a certain color range into gray."), .priv_size = sizeof(ChromakeyContext), .priv_class = &chromahold_class, - FILTER_INPUTS(chromahold_inputs), - FILTER_OUTPUTS(chromahold_outputs), + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(hold_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, From patchwork Wed Nov 1 08:35:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44465 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288408pzb; Wed, 1 Nov 2023 01:34:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjeM5hyroVBNNysFdoFa+kf4QVfZTm4yILmIUptXP5zbTM2e42FswYbeghn3iy7C7HxvWU X-Received: by 2002:a17:907:3e91:b0:9a2:185b:5375 with SMTP id hs17-20020a1709073e9100b009a2185b5375mr1207717ejc.18.1698827698218; Wed, 01 Nov 2023 01:34: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 dl16-20020a170907945000b009c7558b2a52si1241365ejc.493.2023.11.01.01.34.57; Wed, 01 Nov 2023 01:34: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=orlzZ8d1; 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 29DFA68CDA9; Wed, 1 Nov 2023 10:34:25 +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 AD74968CD49 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=LAIy+p3I3n6aPlpCixup+4rr4Lsm+znQW4SYQr22x9HQxrFzLS6g3a438Wi3PxUJWes5omw/Oqdz+AXWgZ9nCnM7EA9nZZQX+1BG9K2u+ejfc3DWgcOy19wMzokh7Hbvzvi8EE3DTzjuqge8/Q0nTv17xNzCwEHPG9iXVKfgq46RadoKPvR7tHHzUq5l8CM6eXUcVWjaCU1slzbzaPhrW16r+GHKYxcSgvgUUUSGfaRx5AM+7kvGA4Xl48nolUfyitL0TXYg7b6h2KsnU7EcHqwghTKYfcf6BpzIttwJe9527cKIBrYvZEyHuXB+9NajKI89HJ0jqRc2reCAFWGrxw== 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=onCoBXCe53w7i6f90CX3n/v+MHLmuNzXjssLW7GTtig=; b=E2F7EC+8DX3CreC5jTiasA+K1kFSJSa8zUZqqD/BgGioKaAFjRWOBg0eXrcvJVH2FO8FDmsumcnNJxEeeUbtsdvw1GOcZBWiAdGXJP0zHeeYn/EsXbr6b75VX0skQ0KakUccQiVCd0zqIU+3Krow7PZsMo/eBeYZVaNtQ8OUyS//g5n3NFKi2btzj7uY6iLnhDwztnZtIG1bespLrEdLBT3xBY2ChbMtP96dzothjAbWEak1ppOq2QNM3MSMLHA+qUFXIA5Ril47VLIIscKMtKcQC94dXS4qlQXeQ5tSuAnoa+syZ/WdF9dsPaGbDRMdAxQsDUwjnfI6UoWGMxiZaw== 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=onCoBXCe53w7i6f90CX3n/v+MHLmuNzXjssLW7GTtig=; b=orlzZ8d1cxjbssgLHSFnKsZT9zqWjlL8/0/lMBM6atJAMAG0j5WKVtSCgfu/lxRVjZVuE9ODr4/h5VVGKgBcPtgCN2KKrPonEQnYdyCmbX3ZzwITqg8qM2RksOVHYAmgdbvx43kW2dk+WPmopjnvu+YKDAlCVphAUOzL6zpIaYK+/0qv/4omZ+ZJawAUgNVwP1a53ZMLGDJJwo7KEM2CcAoRrFRAoHyRrs27TWOOIHi9zvMOR/GtBrmghnRlmWLxBkmLQ2mnlOD6/xzdr/NTplmBnAPPqFOrXPIoeVJmexQ8+FSYncEWD5hA/HZ6KLWZcUDSInKMIdfdHl7cU+i9eg== 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:08 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Cr1SID3Y9s9bZwUW/R2ZIvQ6Synn6mx6ypQB66THELI=] 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-6-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: c594e2be-aec3-44d5-bcd2-08dbdab5567f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1PQBHHTrAaLCmSQofXSTY8lgkBxDuq6oyAE3vhZSnfSxhaGa11+y5CR6D6+EHPHYJkSfeJmHHYBGK6akd5ekM+pnWJWaGmmk9M1A4/AebcEiu7H1wxZ3uevOB8FOWpP1/e9vAjh8BOILiXNetYzhyQZO6IpIkZS4Lp7GxbnXhSMD4Umtv3jt1shTOBtVI/jKVm+sCQ4QolkIisIQKgLidGj8tYXMg8cX3K9KhjmqbdMc3IoHDcEqsxh4JbcQLj3NE4yL7hIpS73zdlTkSGmqCv4JlFAQU/oXZ/fiL4RwokzOdNzb1A5T7mMWeNt8OvFtapfaJkJuNLtrwsFly1C2PKlGza3FnSqrqEJWXC4voXYfY3mi6tGghish51t/DgVTnSQEV9/cnjPGRFr/jp8KVlqWeUudgi06asmE/IUaE1gMwsNj9oMGdJMN5UJOkwgej4K2m2Xyz9KE+X0j4UU3TGZx12C7KeOyjqqZHQNMWx7wLz8XAmVzuZGMYqVa86Yf4hZYpTa45XnT+WwRjEpait9quh9mXdGGGmxOrJhcEvv9+a1wVoDa6ICkwfEO98TUYa4zIgsWIpqcgg8vg3/PByFp4Lz0LRQkZF/xDG61qhfaIK5p+9p+0T6pkVBmGT35 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FtcKJpB2I/sU3oqcjLy2QSP2S6dKNvnZPhCBlIcSoy5ve+gEABTZGYqlbWueE3XANKhlmS5yP1OkbofJysLpWXfvrUt5gYTuTFCsczRL9HHBmFMEJXSEXXKL8DObTzWZjWwc2kgkW2VaMReBdQ6D2khr5FHMHbSpczqQPc5U4cMhhPc/2wt2mD2vJb9srZ0zSE+pjzwu7gyZ+P1NvTo4MYTSmnWGzMg7VEYmExmz6hzDodCADzAw7UgKkpmHkgy+oyDyT4hxBOCbPRaWNeReJHjSRh8VFcyCaUtRrl2hVcy4r6jBqLXH1lBoPg2mKJ5Tz1aE/SoboKZ4GejkMftCuzIujc4h/wLDD0POIPfQaFy0MFe4R+AOS8PTC4sIPbRjhZ2t0Qar8ByDqLnB0hMewxboXgYgbtsLa57PuJOjsmPg82/jSZpdKWrkH5bx5R9NX6YQ3hwiSaj1a03cbN3Kkw0DB242RVo98POmXtLpJ+XPoTbFANhBDWpqBGHc7a2QaxeXt1eMMNExwnjnB29T+qD0tcJhike3jwxz4ezyqAiNkm0WO2ZMGe9cyt+K4ruQAzTEGA2mPMaBo4t9JJFnMKV4iFq89bMqJELMf8PnOv6oEzkp7hkxlOVUT8TGi3WGj5ec48qZOevpsD2tke2Nx+M2dmxEbWNUc7c+FatIKplE0RuqYcMZfi3o+6PAKtiRR16lVPQtBuTK6mf5ew0+uPmyEaQRa6jX9P/1Fs9/IER1tC73d3daZ+4xmaTbCSVNdzWSfE+Tigj85sB2jAG6jeyVT80yG5ia8LTvr7U4VyEnvDnCa4GdHz+baGzFc5fqI9q/5FPp0qQGNdafDoC+VaHzjJ5YLq+KlrEMQVbOdCYN01isjyTNwiyTJW6bsREOqQOhkJpb7xSDGzFTc3SyPsPMMv9hP8bmx7KFUhSCHx+zjCOPJEWKsugO8+JphQWM3SubINZElFOsehTFSYjMhUM4mOGfm6lSSVunabhcacExuqY3CDZAnHzNgCqkUR2q2x2AMbQgAcDY+Lc7+8OrWYOC/nCtYa+3mvbDR/lov5tPloUjjnLmEXL0rEOn+HXRj5/rQ669IYL5J4yCw4oqkk9q2w3HRpg57Hj6uGKvD3RO5UlnnIk3npjW6IpCRLZ5Jm0hli1PRSn4xM8By/y0lUmAKo02GJYaGmbRMj6qOXaLIJX7gTLoBq6J+hQ84IyPPNDLa4S8Hil1VhMGgkcC6MmDOGmyVnE69/cJFZ6ekvJnQlCEmlb2F/uFIBC/SW8b X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c594e2be-aec3-44d5-bcd2-08dbdab5567f 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:18.1034 (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 07/11] avfilter/vf_convolve: 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: rZwYbnQAdJgt Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_convolve.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index 3246868888..25dc92e988 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -955,13 +955,7 @@ static const AVFilterPad xcorrelate_inputs[] = { }, }; -static const AVFilterPad xcorrelate_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; +#define xcorrelate_outputs convolve_outputs const AVFilter ff_vf_xcorrelate = { .name = "xcorrelate", From patchwork Wed Nov 1 08:35:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288618pzb; Wed, 1 Nov 2023 01:35:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHv9aLNbOZTGZzTlg5o9+PpGGcI0VNmGJJ8dLVGbeFH9a5M/CSLK1b1PeTk9VBJ3Zok9GvM X-Received: by 2002:a17:907:9620:b0:9bf:8e1e:b229 with SMTP id gb32-20020a170907962000b009bf8e1eb229mr1312885ejc.21.1698827730576; Wed, 01 Nov 2023 01:35: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 ga39-20020a1709070c2700b009c44822540asi1446764ejc.557.2023.11.01.01.35.06; Wed, 01 Nov 2023 01:35: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=XATAw5Ex; 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 2BD2768CDB7; Wed, 1 Nov 2023 10:34:26 +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 E4B9668CD49 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=MQQtoqJfmWEEocRdSeQL+dzg7oS/pgp93o4tsh8cDMWjguC4FM8f9/TnJ/FEGfcKEbKy2r3bwalL3KzGn4YMHzsceWlqvPCBG5p7chvS5MvO+quy0YxzfPMSGtY63kBmDv6qYjGqyr+cHRX7tBiguah6kgd2ryBVmLUpwd1YNHSg8iDYAo5yHQvcfKze9I+RcUlPLY9Qp+5QBMSCnHKbHKTWcmkjp0F5bmIydCgd79JO66gRBOSWhGdZDY6afPZVOTXFZm22WSBw5gkegli+lPabTlYb1ipGLNxwE0xKYd2uWx442sCCKWVoPLFG3T8hccBG8qdZ+7LrUEg4roaMiA== 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=lxggWYdLiasLy8ehaWWBTRm+8Qvs/xvyDUMU3cYJqeQ=; b=SGB6B6165+kNY6R+oGACt8H4EkRs+6UToV+lcaiJaz0v4MzlEz4cZRhYHizIVo+Ja2DaUw9HD8X9+9ugMGAwwxBk5VSuNxAmZluBdRJ+al7rk5FD4Pmr22OhQ+hKOzl1A43y1aG+6s6wwLis4DQ+IyW7CG0PZHW16TwncKcBrWoo/9Gtx4gE91V8Y3BAHxd13IOSnkcJyXhAbqAhjCHZNBD18OXBKG2NK83S7cIQCjQoHdpcKMlf2T2PuduofBpzWJtxcp3+xjWYhrsnxZrMBI2vMiVXL4O3j7TTdl+2Q8vmkRmEuap/GUikfHxooSDzswL0TUYPFwMmraeaH1lqqA== 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=lxggWYdLiasLy8ehaWWBTRm+8Qvs/xvyDUMU3cYJqeQ=; b=XATAw5ExVSOS4Ar/eXpIBrWfCcYVgd8rOJwZrunEIBSdKrwYrIGDX5R5SiP6ooqxmcF8b+LQSl+umzFCsIDs4Nivqrxc4egG4CyCe1h5tHlLIUstYAi6f69a/s6ujMUjF5ohCKeeeELaRdwwHOUfBjKx0V62fQo54mWQktqnkm6Tewf+PKCgNToUInifKAWOQ7mDwhy/sXwirIcj/g+jQed62KpZKqdZUdNZ7QBjBn4DLN2m4wnBp6xzcCprg9dGDPoNp6A5vwVoTJBNrw/hpS1oXdkvW/rZNSFE6t4vrPewP4qILAZ6RwHITasiwtYliwHyd7I409q1yHwlnn9ALQ== 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:19 +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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:09 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cHG58iVpu2ELlfnyRlsGvgZ0EUIpO2UQd/JTZbVHlF8=] 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-7-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: f0180458-363c-4a23-c799-08dbdab5576b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SxKz+1B+OaBauqjTsa4bizGB/r1ISfgRfa9AKus4BdsQRMd1OX8CHD3skbns+7Lk4kj2+xpuPDaGq7+2gffLJeYT3YSTxZWe0rbWpGDU74f72SFAgfrA78+5QxHQxELxow9yuqVYyovce0KYxlHZ8wC0SukMJrfqiKw9AMBcpnKeHxUueQDjRjcBKEmTU3gV5D+WfltrwirlAW4uMOfxOHA72o5luJ/gxGYYWNTdAESyaRltGK5ijrxu2GV41flAki9M/sDEsco3Ey3SAHryWUXxCFJbrUgnXoF96YPOwKkB2qqwvdmlWvG8gQfTD0pxcjkwMQsyizuNpouc3IeCef4huW98Q5PiMxWb9jjA3j2oVOS/gjTIZRJLkRLDEaz/cl8Z7pWsoJoso9qvlbShNX24CtvtDgMsHl7X1UDVWE1ViIHxgTGSM0oSfWKYKA+FY+T8v9CDjNk2N/7sAndEcLmw/BarZZoKN2WBF0vEoNP8KYxwsBRXb3EAOHfmWxHUn6KLUffbDLaTs9iGygw7e1+6wcM9cKswGQoN2ZwIcmj/x7yGfJLSxS6QbMEymNRUahJkWXUIh72jZZ9do9n1kNQw4IOYN4ERw09yeMLSbWZtTEsfUHBB4CMwoxdQUbfu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pwOM/wTkK9HSpPHuKBvWHNXOARF45gpUv//M/dN769r+7yv4tgkz//H+bKG7tN8O7Re/GMIWWwerNNhNk1HD+oYruS2srmfehEkgY/uLvG9qkOcA1FUaqsUsZnsInFdw2XjnH3QiKQg1Vixph6qmewM0BeiW1EkqZwLC5Xq1QzyWKAgzNfbsWCIYjrqlNiTiFC3cNojn+URcwGOhO1lGFPVXyaITG6MFNwHd6KVRtAy9yU23qYesLWRNVU3C+QNB+++msuPICnob+db7VVD+Nmb+TeXYXQnUrfeun4kLj52lIO3IpzYYXtblEP5u0u6pqS0s5FwDiGEGFbiIKkTW+QFBbyAeJfobLGT0dNIjbo0EAORLqBAS1+dfWc5cK4m3ezqOqylLUixSEm60aHzVu/5m0NmZ/US9YTTa742MeeFHueYvg7zC+R2qVmVR+T0cUmDlqh5ugf4Z0NVD3YiWP41+/bmYCcixDwEcxdS6hfkcPDZtCFwt3NGCiFJTNbA63y5eVfw/LGiyqbWIT1aFwnDsubcookPtgFSPAQsTG5tqXUr73+XmMDhcqXQSJYpnZ38SuLgBiJ9nShx2lesv8J808Fb9mE3gzFwJ90K22fwMpecOOQJJ5Z4Fa+0zuWyCEJFWvCxVi4pcMBHzWZnCMnx+KWzO1RahJI1S/yKzFiS6KUT/e/1lrwli5i6O3d4d1jLZ36291WoLtVSMbue7R0FeBlKHKGXPFbFoIrHmf/gdhQ115JscS8gk8saG2meBvdGtaNR8hELqd0hA9qsVXy5o3efC5judaBWvpfY9vKZUOU32gU1McBGgi64HpJGxGnF9fxpFh+RgV8mCWErMtLKPaK7Ooqf19rRJoU41AtLE6R8ICZIcZnOpZAxYEBRvt5eT7A6S+GFE8Ka0PprJXEIoQnjeOSfgBI5M6J1pOAXmseVkSYknDQNKbAgpPlKod/xRB4zCStDPwfEUNE21lF5knLBBqpjaTzWwyZq/LC48aPvxpb6w2VfpvSPgnt07Sf0wqUHiy/cNsOVzlSLKpoNZOajIm5NQA1QlO3t8hWu7ObOOL1vnvul/yPIy41Hni//O57foTFURkegE7oDAImOvMCdkjjla9br9sS2YtE6P0Or/rfW52FaLvV44a0OeIRil8kn7OqotV/QkCqA5Q1T1KgQXHWmCZams0w3BcBofXbrD5mZt7EhzzLOK63Qa1WPKaIElIpHKK9iEeWIyd/2KXMS80qB40YTQdvAsHwcSTnoZ6Jb1ZeIT+zJWht0R X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0180458-363c-4a23-c799-08dbdab5576b 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:19.6104 (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 08/11] avfilter/vf_hsvkey: Deduplicate inputs and 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: z9078YiVx3Di Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hsvkey.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/libavfilter/vf_hsvkey.c b/libavfilter/vf_hsvkey.c index 542ac1f3b2..0bd8cace37 100644 --- a/libavfilter/vf_hsvkey.c +++ b/libavfilter/vf_hsvkey.c @@ -265,7 +265,7 @@ static const enum AVPixelFormat key_pixel_fmts[] = { AV_PIX_FMT_NONE }; -static const AVFilterPad hsvkey_inputs[] = { +static const AVFilterPad inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -275,7 +275,7 @@ static const AVFilterPad hsvkey_inputs[] = { }, }; -static const AVFilterPad hsvkey_outputs[] = { +static const AVFilterPad outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -302,8 +302,8 @@ const AVFilter ff_vf_hsvkey = { .description = NULL_IF_CONFIG_SMALL("Turns a certain HSV range into transparency. Operates on YUV colors."), .priv_size = sizeof(HSVKeyContext), .priv_class = &hsvkey_class, - FILTER_INPUTS(hsvkey_inputs), - FILTER_OUTPUTS(hsvkey_outputs), + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(key_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, @@ -337,24 +337,6 @@ static const AVOption hsvhold_options[] = { { NULL } }; -static const AVFilterPad hsvhold_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .flags = AVFILTERPAD_FLAG_NEEDS_WRITABLE, - .filter_frame = filter_frame, - .config_props = config_input, - }, -}; - -static const AVFilterPad hsvhold_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - AVFILTER_DEFINE_CLASS(hsvhold); const AVFilter ff_vf_hsvhold = { @@ -362,8 +344,8 @@ const AVFilter ff_vf_hsvhold = { .description = NULL_IF_CONFIG_SMALL("Turns a certain HSV range into gray."), .priv_size = sizeof(HSVKeyContext), .priv_class = &hsvhold_class, - FILTER_INPUTS(hsvhold_inputs), - FILTER_OUTPUTS(hsvhold_outputs), + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(hold_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, From patchwork Wed Nov 1 08:35:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44468 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288679pzb; Wed, 1 Nov 2023 01:35:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEoOIMSrRPabHdjZjHpsHazaj2z9SDuLGCO0sT4gHihPlXCKjVwxPoO7EHfyfKMmLFVvEbk X-Received: by 2002:a05:6512:690:b0:503:2dcd:30ed with SMTP id t16-20020a056512069000b005032dcd30edmr9755123lfe.0.1698827738892; Wed, 01 Nov 2023 01:35:38 -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 w21-20020a50d795000000b0054360376dbasi523703edi.613.2023.11.01.01.35.16; Wed, 01 Nov 2023 01:35:38 -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=OqNSrxB7; 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 3A01668CDE1; Wed, 1 Nov 2023 10:34:27 +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-db8eur05olkn2078.outbound.protection.outlook.com [40.92.89.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0AA368CD9C for ; Wed, 1 Nov 2023 10:34:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DGX/Cdaj+2RAr74TdZkMEtyUWd2G7MTi85sziUeLua9esjglyc4nSgaZYFneZVEE2NVzhV5VMZM44S9ftZX2BTKXZ4L8v6UsAnXnCRTkV9vxcl4OSRFcXFHf8aXPILe4CRxGfCYKg8vAN7iMz8CTJpcgfblzlGhPqrEa+M15+nHyEuIoATY0ODNUJkYsU9XfgimYMbOURgwKYeqvJCHEYmJVOV2fCPWxEA8nCmD3lp+BLobZ0unJqrSfjBZcytyjUB7yodsPtbGsl7E+Nv1Io2Qw1GzwnlAqSw+nFM3Hg1HP77hMtbSQo1Sug3Nfv58fEFRpYhIbQUmNbERl9Q7+JA== 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=/LytBWWAemdBzGPqbxG5RvQFeVCwDmnvAdDSpAhjU9c=; b=Ixvo8Z1ejbbKKJtrgdDXvFH5Ys4v4lPHKxDglwW8cVOJ9pOqV3Igpg6Ek/VOIENgEFD8pwo3ezTDo7l+c1CcSUom9lxP7muXGfA9GfcXYnoSO/Xm2xZaS2wETE0627Qt+txM2VhypVn5sESDKPnLrCBKnk/ZjJj/ax/ETSpwwCCbVwg6+PtlVJHl2uBtQNUT4nHhBDuM468wlaUMFM03nHcWUS2NCYdxF+OQsP4t8J41yfOF3ZDCQwWCSQYnXBVDw3xUGjJUi3LXfgTzuNy0PZDJZT5fWP2dl01AVkVQUzqwKwFbktyXgL+XpqRzt7KaRtyB0VpHU1EpXR34KDCQ+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=/LytBWWAemdBzGPqbxG5RvQFeVCwDmnvAdDSpAhjU9c=; b=OqNSrxB7ds3V3aKWwNd3jUOvz1ZyR12RR/eS1y8I4h/mV7gK+M1kHYyz9OVjjXMHke0lu+SyKCh5i191kXfsOJW3b6H4fwLjcIfndxz6b+YTTfGP7cljMU71vccQxRYDLn/nmdHu2yenq9cum2RNzMFt7Q6axhumseEZCBMXeaYZfrfaKASIQHnh1pRNPiKrCmDQB0WYkG1saWTIE+LWCm1i4wIe7qqsu4myHwCb2VXtD8xQeZB5EWsHra6XVpmMwWkaptUaYSbBPEQbgHlNHm5ty3g4MKThbMfz9WJoqda3s+RyC7RlHFNZDkPcPaLeD6UCIrRobgNTtRIqIhYvPA== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:10 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [wYh7pR4hZVtkTh3V5QM7Hlj24DWG9hC2jc8eCVsOxLE=] 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-8-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: f9bf237b-bda7-40a8-055c-08dbdab558cf X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZbcnPkvZJr4N5ic1v1zw4lzxetZVE69g3TYU1/Ui6msf/i2vIHO1WQ/AsK1Ey8AITy0P2w8uZoq5DP2EzmmzId0xG7dxS51bVWr6AEhQX/JutiX+mRD1834Gc91YlynUE36tp6bh/EGOhOCscp5qOn5adIrrK8HjYD3HDDCCGNiuQDTfNIH3JZjc4b1sBiIuAX0TfX1L21GJNZW+wqI2YL+Wj7plzDicBguDg2cWh/oRFevQaHvPCKpmsLhabfkNMdMIgsQqL1H4NRBUh2509KaY4OQMD2hohpjcFTunKO1OvkRazv8JTua9slUe+BAdfIYDYYN3LOBLa/sJN9/oZNyhcivrwnFfg7DbJhVIdxpP67KmFkowgeil3URbeF4JVSu99cSagEPl1ctfQBu8E/9nZCckFg+5gLMEXlzf4U2oTyLhFSzWLAT/sYphSahjqF/jAWchGku0z2T6b/G8Vhml1jIh3my3mtqtkYUAgFdPMMYYr6ze3JRu+K6+is5JkbPGiKafmEHLBci0NuKXBpQaTipfArmaeJvcClZw2FNbDy18bRYgx7FHKHdOrG7teiWVQbbF3ujkn3Wp4533PDbNN7y7ssQF/rXzQ8ZxRebsDNd/n+epruKtFt2h21mZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jUJUz8rcpHXmz4zJR4+hB+x3eQedKMf8JCAYuB/qXEg00RP+LyePow34RYsLJ7fhuu2xIN3LpHaeHPmOJX8akCg2Yw5j3KZRpYGbk/w3qPxf3jfeNag2FUoat7EhirnYdn8vOFFGGpJTawDD7EiRa0HTOVxlCwy17qVC1G5nFr+K3k53G7zrqb8kXQnsiJ0Zn2q9Mwyeaq/SIbpWQk1GP0HEyVFI7z4quT7zoPbhBSnuYWy0dQ9b6yKbivSfZFbgOqK7cG0gO9y0fGVTjEW7IgVMQNrjcSjcwUCfoi7hpp+4oBnyxfQJ8aMvuX/bRPGtlRfRWzGHTr8hw59zHyUaCVOkQbXaMP0M7GxHZ0KGHhck9vEUAwbE2vH1QjwHJnzPKxe+seUvrkjKuXLYbRb91Cdi1l1R8BEDRj4jdafMhp5Gq8jjC54rmMdyZlVEEGfRdUUPN57Cmt1yQGCX4h79QuMZwkPrz8Nb/nPsr2vZqL/TSAtzMyHmzuYf+/UC0Z6FNkZeO1rtcOT/Fx0lSF5LQpi53V49dsFqzsQznHHwt3WUNIYe8bZmSr+xiAqPOTLoQPARRwtoauGvHpERXAbPrajvawQDsMRKVwBNl5Itjr73S8rR78XbhLzz8eEwC/Tzu8OzBGz+qu8wIkHLIO5VHBrujWjcrd7g5vRNlnVFmSnINpvXBCmm4OWBMmkmzsaeI+jx/iF+DUvq3p220wiVVdJuDR9lALYaXax6YtakWt6cLzyMfr+pIqCXTxurfL5wrhTBGmQaYQaZQDbuciwLjEsbnFtW3o9GuHb2RFVl88mBt3UT55q3jekid5RFdNi8hkcKtKMjkVLfR5Lc7P4UGxRZFvI8R+ih0dUzh/ha1Na9Bh30Nr+5gdI4VW4dLShAgRZa3bAaFEmhHOJCT5Xhv1tJlD2hawbMpzmMX1K/wZ7zYNdgUXX4s6E1TqrfmHnLS0MQkwT7IsmJbTQSwelPOR7VT+lXY8+5QJHKXM8TPnG0G2fj9bVyR7imsgtr2C0tlM8cVjVCKKSQbMn4AT39xL6tJeUye0PIkdGvtxmluI2+9ixL5pr2a3dfvGO0heOPQFUJI4j/GTVzy2LP4wKqBg16mAQM3bHVfM3QSvDyNQ/O4s0sAusCqLMO3SxPQcgrn890f9RI9+zzE6QxarxWX+E6HFMvj3owtLN+Rw2n4x1pvXWaUSjAlviK2OSP1RjDcyn2Gzb5L8Sbg5zI5p3ooY8hW5eYVV6IvzVWUHTlA6WRE154y9LJVwQE/3ZwA2/7 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9bf237b-bda7-40a8-055c-08dbdab558cf 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:21.9277 (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 09/11] avfilter/vf_xmedian: 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: mtJtsfNdP0kY Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xmedian.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index 0a02ca065e..ebcbea97ed 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -327,6 +327,14 @@ static int activate(AVFilterContext *ctx) return ff_framesync_activate(&s->fs); } +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_output, + }, +}; + #if CONFIG_XMEDIAN_FILTER static av_cold int xmedian_init(AVFilterContext *ctx) { @@ -363,14 +371,6 @@ static const AVOption xmedian_options[] = { { NULL }, }; -static const AVFilterPad outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - FRAMESYNC_DEFINE_CLASS(xmedian, XMedianContext, fs); const AVFilter ff_vf_xmedian = { @@ -448,14 +448,6 @@ static const AVFilterPad tmedian_inputs[] = { }, }; -static const AVFilterPad tmedian_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, -}; - AVFILTER_DEFINE_CLASS(tmedian); const AVFilter ff_vf_tmedian = { @@ -464,7 +456,7 @@ const AVFilter ff_vf_tmedian = { .priv_size = sizeof(XMedianContext), .priv_class = &tmedian_class, FILTER_INPUTS(tmedian_inputs), - FILTER_OUTPUTS(tmedian_outputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(pixel_fmts), .init = init, .uninit = uninit, From patchwork Wed Nov 1 08:35:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288711pzb; Wed, 1 Nov 2023 01:35:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxY3Zh/RKB/UV4DvvYJ/EUmukdGKHjIucCh8d3KtDb4Ou3Oi7YI7BdPkJ9v8EL5Nwr/E3x X-Received: by 2002:ac2:596d:0:b0:4f9:5519:78b8 with SMTP id h13-20020ac2596d000000b004f9551978b8mr9433991lfp.63.1698827745227; Wed, 01 Nov 2023 01:35:45 -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 gy5-20020a0564025bc500b0054361a4138fsi536048edb.236.2023.11.01.01.35.25; Wed, 01 Nov 2023 01:35:45 -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=DlyVPonI; 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 4CA9968CDFA; Wed, 1 Nov 2023 10:34:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2070.outbound.protection.outlook.com [40.92.59.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A22A368CDAD for ; Wed, 1 Nov 2023 10:34:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MikoRmSICRJ7TlvqYcdj+y+hjq/TKpN7H6eROHV43ApQ7nlNPgGSnTiCOsmiLx67lYkNKjQzSA7UQkjV0A1q4yRzIGKuVIZghzPPlyOAjTHKqqX9uS9ctl3CVgn96y99SWwnDLZqvO56xwjC8N7QZdM+xVhT9iyicC2oQNk7ABgnKz+9qAV6jfr4SBjfbQlqw3DWeR0I19hgn4kgTMBxnKV5R2XG5yFrvOiZh1tM7KbDMNu6fDAAbkJNJVhxrTbimdB9iQ7uHAG3AuuiJNAW+hCUp07yjKCZ+ZC7Na73bD3UjiY+qQHpD8vyDS3cg9vGueyohu1EkgjaWZWA7ZFVng== 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=fRp8AslysxHi+eh58GtXQWbnpyFbSsJFkQ4FkW5ljXo=; b=a3ebWkk35zSUJIs/KpgGRW9o5/9OjOwroeZ3dLNYHQmZNoziM+mZI1E5I+27FLxyRhvYvCZYNM59aUhhvyz9AYzrD17eTO3WOMhUrw8qU7em66QtL3flpkq/LPm9mmP8QGHslLtfLxYJni/FTqQHCbIeVz3WGLx4f9hJV9ap/oLLAr40Hks9AV21hcH8lxG8149tvwYLE3FusAF08qTztTSMTXrZeNRFlkL4AgULiehIzMayxnurGn8zmkQgUQHitiDO4N9J/G4nNkUgupbqY/QC3dplSj2+Oq++lxt8n2QO3bduSg5f19PBBsqcyDS8YFGVs842TWfd2m7+LB+OjA== 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=fRp8AslysxHi+eh58GtXQWbnpyFbSsJFkQ4FkW5ljXo=; b=DlyVPonIzlxWreG5H9Y28kbRbHdT2JhZCGEXE9h/kUkEfD79VD/tKM1PD5U1ZHd3cIIVh8tNM9GaHMFnb95ib1nDs7RBTSTZs4iP6QJhBgx/s1losowMcNpSKHVJD/HSL21fk7Dd6uwNXo2qnintMDY5oAC1dQ8qgGjBOwAT5UyNlr1wVSIJWW1BiKGyrZbJdDzN+1PRmm9A6dCzSLvGO8eUOLmiGW1hxdUaJIJ+YM4jA/sdY8/9eGBROadAFSjQJ/sxiCARXPqhlwyHLVjd23Bb9dwPJQeaZ+Euqipz1btB+3jZzm2tveM0F7t5+cCcx/1cw+DAWTFgfEqUlh1hcg== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:11 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/ZPlynE2mtfplQ68cTF7Zvu/uLB/kM4AeKLPfCKk2lg=] 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-9-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: 742cbb32-b9a3-4bb9-3557-08dbdab559c2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hah99vEYDpG116cEmHy1yW58ECjGOEUmHbMa0W1eOAmTk4PZT+CqsLntptk+QKH+Ca1qxOnn/CEqKGHzukXuHnt0wjzpjDeHdAjKqGwoZjS+IGe0kgP5/c/Sd5KGVqm0vb3UzoLIDCWMiKDpy9pyD0K3FRfh1EAtpMZWTIOdyxSD0aV3JzhhY61O9qABg7muWbLpdHbPldsMio5DXUpOPmD6/sxULyfb5TTzZkaVoE6TEYW4tUgegKvr5ahBRTBeAoVW3wdAjYGrJCGI5+ro+xlfGAiVzZeTuSqS5wN3qM8pkrAhjly9K5umrREHYWbnMQx8BRYjUVOUdnH49pu1PDpf7BhRv9/UPT9wOkrt5SYB1e26NKBrHRtqvMUN6kqK6hujGqb79wHVY5cb8XNKjtsOULGRVJrsMhSijCRPOQg//2JqfNA1eQm9pgepJmVQx4Dxm8KXLpnuSZEKU4yEC6vfOyzWh6zk48qpRKvhg6dJar1jWxZDsb24M9RzpeluJawpHqgZmdVIzr7PWGkkiuikXPniKSPmgQw0aDU0vbqD3yi4SG+sJa+0XOOogZHGI0nIqj14JiHU8BY3yt0EYiD/fTktBCoJEV8mLbhL/apK+xPT175vZLoQzvjcHn13 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bzPqAJJJSeru0IbqeoiIe7GFJUpmH74v/beiGFbVAWhOIyEttIQX0+7ks9hdUaR0Y8X9E1qsGezwZior+iOg/a+QcusAQChiW79dNTpclNfXH6GghSSTlqQ7G8ERrcupWOBMccPcxG3B0uVEuanOehM68oHnqDuT/PAtfomExy4wcQ0TwRi1NRDK3dpqPUVb65PXsXoaINX6Sil3Fi34Kwdp0BVxZgGWnIFHKIMSjq4Vf91Kxg7xciXfahdxmgpypvu/68gRuP9sUOCQrAf8rvnNC/fclCQM8BmkXtoNKPQ75dfGFpkNWuWpK8rW2qlukoITZqR52e0vm2UZBVObCJkJMWlEuzvsrZ+245vmPrhdUtQmvsMTJTRneRc9fsng8qFZW6BesuhHQg+DTuRo8cgMaduibj/Trl08KSpwf5vmpYxbQCtr7k3mITed7iNux+0FCheegiepa2aHnnxY7SkVgkkAItAInkmmG9LQ6kAbpCEretDtn/ZGL8W6VJU2scqO6r0a6OGO0D3jBJ7pa6pzZyXya+lqk5Xsc3ZiXYb91YMy+oBQqR9GBLTku5ojUJl84PMVKhSqWf9BsFrRcJNV6TWDy/6Qpk19pjBKHMMYGMby7sOFnqMungxiDtPkmNv7oIgJUI2or7CpmQTTzY91DLfo6/ZpQg/yaKKz8swSKUrvrMFVAuzQsPu0935kzQb210a8HTBR4ZMeZUZH9CFXvE551pRxheA3Hlx/8+3z0x7DwE05tY+Wj221rjiKBfmqT8QOsdOatFYdxzCV5EcZgMnAldwtDKaavuLqsU3lRAkI+vbXZygq4f8x9nHIbr8pK+LFUzIL1QRfQKP0buSc+qd51WaGSMUKKrsy5Eq/YhnT4HikgVbO9kvj8qMEyfoB0B+8/sKouGUXioy6lQW8DRpWvohIWkcUTRQpqFJP71NfLY6zG69cgfMPz6FMd3oJ6u/qKO9avntBf+94kiFv1VkQ/hgfokZ+f629B8YCGLGd9MLJ63XM07alhxMPB6cWnHZVYGOu4bt+ketBemZrN6ICrdhm5wcSH7iWeIWWOk+QT7Gfzdgq2zVOlIfFjSfmSd4Gur//4EQS3jhhlgGPMcn4DAsfOt+FiWRCf47TlZduggAeloCwi7b/5T4g+eDUd888BHivceOLkftP22fzAUFDc3K0j0DFDtJzfgPFI6rky5lxg7T+AO9tIRIyS6ZCIqfDTuOsnxjMIzEqI7yG1jJHj+UR2LNUmtHlcKKcrArbO+T5CRfLSesMayZ1 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 742cbb32-b9a3-4bb9-3557-08dbdab559c2 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:23.5050 (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 10/11] avfilter/vsrc_testsrc: 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: Oq1L8oi2+xXe Signed-off-by: Andreas Rheinhardt --- libavfilter/vsrc_testsrc.c | 64 ++++++++++---------------------------- 1 file changed, 16 insertions(+), 48 deletions(-) diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 9081b55f1c..da17e950d8 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -160,6 +160,14 @@ static int config_props(AVFilterLink *outlink) return 0; } +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_props, + }, +}; + static int activate(AVFilterContext *ctx) { AVFilterLink *outlink = ctx->outputs[0]; @@ -465,14 +473,6 @@ static av_cold int nullsrc_init(AVFilterContext *ctx) return init(ctx); } -static const AVFilterPad nullsrc_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_props, - }, -}; - const AVFilter ff_vsrc_nullsrc = { .name = "nullsrc", .description = NULL_IF_CONFIG_SMALL("Null video source, return unprocessed video frames."), @@ -482,7 +482,7 @@ const AVFilter ff_vsrc_nullsrc = { .activate = activate, .priv_size = sizeof(TestSourceContext), .inputs = NULL, - FILTER_OUTPUTS(nullsrc_outputs), + FILTER_OUTPUTS(outputs), }; #endif /* CONFIG_NULLSRC_FILTER */ @@ -688,14 +688,6 @@ static av_cold int test_init(AVFilterContext *ctx) return init(ctx); } -static const AVFilterPad avfilter_vsrc_testsrc_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_props, - }, -}; - const AVFilter ff_vsrc_testsrc = { .name = "testsrc", .description = NULL_IF_CONFIG_SMALL("Generate test pattern."), @@ -705,7 +697,7 @@ const AVFilter ff_vsrc_testsrc = { .uninit = uninit, .activate = activate, .inputs = NULL, - FILTER_OUTPUTS(avfilter_vsrc_testsrc_outputs), + FILTER_OUTPUTS(outputs), FILTER_SINGLE_PIXFMT(AV_PIX_FMT_RGB24), }; @@ -1424,14 +1416,6 @@ static const enum AVPixelFormat smptebars_pix_fmts[] = { AV_PIX_FMT_NONE, }; -static const AVFilterPad smptebars_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_props, - }, -}; - AVFILTER_DEFINE_CLASS_EXT(palbars, "pal(75|100)bars", options); #if CONFIG_PAL75BARS_FILTER @@ -1474,7 +1458,7 @@ const AVFilter ff_vsrc_pal75bars = { .uninit = uninit, .activate = activate, .inputs = NULL, - FILTER_OUTPUTS(smptebars_outputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(smptebars_pix_fmts), }; @@ -1518,7 +1502,7 @@ const AVFilter ff_vsrc_pal100bars = { .uninit = uninit, .activate = activate, .inputs = NULL, - FILTER_OUTPUTS(smptebars_outputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(smptebars_pix_fmts), }; @@ -1585,7 +1569,7 @@ const AVFilter ff_vsrc_smptebars = { .uninit = uninit, .activate = activate, .inputs = NULL, - FILTER_OUTPUTS(smptebars_outputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(smptebars_pix_fmts), }; @@ -1688,7 +1672,7 @@ const AVFilter ff_vsrc_smptehdbars = { .uninit = uninit, .activate = activate, .inputs = NULL, - FILTER_OUTPUTS(smptebars_outputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS_ARRAY(smptebars_pix_fmts), }; @@ -1735,14 +1719,6 @@ static av_cold int allyuv_init(AVFilterContext *ctx) return init(ctx); } -static const AVFilterPad avfilter_vsrc_allyuv_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_props, - }, -}; - const AVFilter ff_vsrc_allyuv = { .name = "allyuv", .description = NULL_IF_CONFIG_SMALL("Generate all yuv colors."), @@ -1752,7 +1728,7 @@ const AVFilter ff_vsrc_allyuv = { .uninit = uninit, .activate = activate, .inputs = NULL, - FILTER_OUTPUTS(avfilter_vsrc_allyuv_outputs), + FILTER_OUTPUTS(outputs), FILTER_PIXFMTS(AV_PIX_FMT_YUV444P, AV_PIX_FMT_GBRP), }; @@ -1885,14 +1861,6 @@ static av_cold int colorspectrum_init(AVFilterContext *ctx) return init(ctx); } -static const AVFilterPad avfilter_vsrc_colorspectrum_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_props, - }, -}; - const AVFilter ff_vsrc_colorspectrum = { .name = "colorspectrum", .description = NULL_IF_CONFIG_SMALL("Generate colors spectrum."), @@ -1902,7 +1870,7 @@ const AVFilter ff_vsrc_colorspectrum = { .uninit = uninit, .activate = activate, .inputs = NULL, - FILTER_OUTPUTS(avfilter_vsrc_colorspectrum_outputs), + FILTER_OUTPUTS(outputs), FILTER_SINGLE_PIXFMT(AV_PIX_FMT_GBRPF32), }; From patchwork Wed Nov 1 08:35:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44467 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288657pzb; Wed, 1 Nov 2023 01:35:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgz59DycKBFHCie6SiaeQThtfyjZFS2O8mNM5zvoJElO6yaXBD0KOCVuUKyEX3M+pa9Ra0 X-Received: by 2002:a17:907:31ce:b0:9ba:2a5:75c5 with SMTP id xf14-20020a17090731ce00b009ba02a575c5mr1243104ejb.75.1698827734682; Wed, 01 Nov 2023 01:35:34 -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 ww3-20020a170907084300b009b92b17f406si1385941ejb.75.2023.11.01.01.35.34; Wed, 01 Nov 2023 01:35:34 -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=GRf+s8BB; 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 5769B68CE00; Wed, 1 Nov 2023 10:34:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2070.outbound.protection.outlook.com [40.92.59.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B921B68CDB0 for ; Wed, 1 Nov 2023 10:34:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HCNCTam2vDgwcAJ0/BWqTEJ3LOqlJaGfhGSjvHRXk5HsFO8LwOLCoWLW1JLKJQZGf9KWBlydKjfPzCftj5nYbEUhGGaEUjlS5kzjr3vtUCdCagamidoic+j9XvEApay3dBn5FyZb87D3jMesLT3jylJLxYRJqQAd4NaEk59ovdOvJZicDAzFY5otb1+gTh3mNBsk4kHbsEUy4PZRZQ45wWRaPVl+ZFepcB2WIUj6UVF1T+4HhH6d5lFmB2xFqzN3+Lw9hNY1Cv47ySar+1mreeUr7cI2TmAlttSo4WWEFPjS0vQiVq4W5hVoWlmbkuhUsLHSFbqoIxF9ljBrp+DipA== 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=UwZuqRWCeiI/Vy69aKgt8JAQ3GFlmlK1gkDWUQtOvHU=; b=iZO1brKo9xGXri/lKtp/9qfWn5MHRpiLMIWj/kTKzMVlfJHRr4qlKbawe0kS0WEKbwcu6EAmml/4fGOl0hUacZMYeAoVzPS1nfkHISQpTy/x67dg6N0TLn3bjt7zb/l7kNtiEEx7PpJ6rtiy9lhX4nHUhEAbZbINfwNimTwtBszjLwMvfFSX4gt/PyPl5aDp7slKgJrzgYTrEisq5+SGSsqHHmwbgWFYnysLISq4PTuNYTbsNR7wXWEL5a/2ddqRGMHZ8rHiFp1jTXsVZw/osIeRbUitSWcNXrxA8tln7yhXqfZCK+afbg969ouiWGdaDed0mrz/c3ZfxB9SPAD/wQ== 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=UwZuqRWCeiI/Vy69aKgt8JAQ3GFlmlK1gkDWUQtOvHU=; b=GRf+s8BBFeI2l2ESasOOAosm1nFkG2/+SnArexRMz280ydy1x7zBk7ZQdUKOykJrxx0QQVM0efYBvLoHaQRXyFlCR1VBcQ+OuZzLkfdLQ/ai3PV1dXsovLZhJAYf9dqNs2QajHd+9vfmxLl1Otj+EhvIllZINmAzOrQwu2bjDRohMR9tLzDfNkJkrpD6lFXl/vGMax5a8Hmh+helE/pJ8GV22JRujFSwZIiNNxpjwclEN0X32njDsCsX0DwAQdYhrn9ls4VkCwsJY6l89IGk6ZD7bn/CtEpwLxC8OpFyXVBHYek+Hzxpyj9P+n8CDrrUy1ngmZMd9mM9Uyi8uaIYNA== 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:25 +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:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:12 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [THvNHr+GKR6cP1kPJJfg/UgykyNsX+BOenJDXMntQS4=] 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-10-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: 8742ea7f-19e7-4d4c-646e-08dbdab55a96 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s3cWiGKE67asjfVu0tANvxe5NCiR+mtZxCvIpebrA+93UlDOkJCpYjESAHwqV8ChAfu6sUQAGWnKt9tcWSVjzgyK/Wg0xOIF5nyuH8tQkXZte24So6IRq0H0zkdf19h6tuGf2eAxPUYM7mVaHG43GsCQ+NuV5kBWisYMd+FDTJ2LQ5+Dp7AFfn9PyJqx/bnHtpS+LuD1o2bjuKxRSBZkoJwh5bR77fdd3CNqztWu40PmZAzFfwLmsJMLeFUDaNOGzxRvo8x1llyqyAA3+//TXPEd6xYFCfqebOHRRyxjGJsNJq9S6Y1mUF7Zrg4qYw05SHuoehcjkri9LccDcdjXe9LJnZ7L2ZR5eKZATVOaj23j12wMYuvxU7ZGCWOGJbO5LiqndTW6Rz+QJdqrSD+Mr7vbYcRnXaoc6B53dsHecT+AF5EVi9ZOgFoxu0XrE8jK6DocgcpnAqbglRVJIICXA1nw6nwiBYEMvX4T7D2HBALvTgEGP83nIlkLMql6d2FC/+X+9RDwAzzDEB/vDHo+YQbf80BrqMQWxaIN63wA7al5Iho9wObP17WdBiBYmNOIfjRQSq0tXoKjBSZkYSIpeobp4ECJZRUPQg9ptLJXnVYax0A6K5xBd6XnqiIlZGtk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zGOWVXm1vTP26Cs+JYmWjuJTfRQ5tT5jPF+hk1/V3wkcK+FdmkUdXqqUQ/7IBxy4brBql5D9QJ/uy5Yd8CQaMwndUX6JLaEzmhk2l6Hu/uIpcJrGdw4MyWQFhZfsd/H5jOnKzxKAF4IIc0CqYWAho+rYOh/16zD2zjZw9LqyXpUtBEHQbFm6hzc866oN+2VJOyaWHHyIRhejNP5dSFhXkNgec28d4AFo/AOVmGqasQsNdgmYWHz9AjXpQQLRiI+7Lm9WnmhYMqH+hNhLqQ77bX3ghhVxy9KgSCYnbFKHqLqsxqYE9wDvUDpAo1x4YXSRWskiZBNO9BzXoWwejoPb4ntmyXx0pIapUqQfDg+UGPux0y/P6skVViIi9v5qobuD87xz3lVkPmyPAJ0FF8pPKiKD+tgI8MEmaw+vLc9/EKI3v8jghGF0R+ooUwChWfW0FaUDLAUT3zM8iJvBQzj02LZPqa3bA2v3X08PtkrP68G+j4M0Bln6APwBVuvPNFbSmyf87hI5hSnrYKtBrAvwfI5LZFaE458rx4dQHo5rn5qtMFm4DQteoxyxztTz6JO6Aw/ydX5sVnqNoA4m8C2ZfGHrmuE6nBxQCkr/OGYzL+Hb04gyRoTPr/wuJ9YjpzxiBqwOzcFoSWApXAAPjO73x1lJiYvF3BqhyTKQvJmN0Qpf8te9RAOx07TaR9Hp3SEXL5Q14em6LTunlIzGUc7DIhvabdugqUs/U0UXC1b3lp/i7punsPPQiWnjPSqL8YGUYAXAbWmcxTx5z/fyelBoX4h+34zjCCAiDY3nlMftQn1sDCU7N7olI2r7g88J1G/qP9rFoqnyYiKoJ9ZX20QxbRBy6HuzkNUZ0tYmOfc2WMRiV5TG8yY5467qRj1EdWcOli57l6E2P1FAwpZx4cGO812q0v/YlYODecIAkLqaKdJx/Pi52r4/iIrqDNvS+4ZJVbcXhuYJZLtLZUs+RolArc66u1YKixIFHhbe6O6fwdmsxoAi2lKEvFZ5uRtYOVMeVD5fEL7KPssCv+f5JC6Xw0GgxBpO0gqllo/MACOEitnJGMHuM91dysmOLMGQdz566Kw4lH35mPtt51mGilHvOPDQpkW6FCpHMeBdHM2pioVFan1hzUelI8zkFgXjphcxGYcpb+R4PXTcO0J3K/2g8aYt9+EWVDfSt9Xx4l8sv0DCaGgJ4MQzRIURWol1nm+TWIpUz1Ym04NNs8vMn5Z/3VGJvSwSZGcw1OxTl1G7XfJWoz6a7ZgWDoIi+7vLd1po X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8742ea7f-19e7-4d4c-646e-08dbdab55a96 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:24.9167 (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 11/11] avfilter/vf_format: Deduplicate inputs 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: QaD3BTU0ZDmU Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_format.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 04c265f59f..1189bd61c2 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -144,9 +144,7 @@ static const AVOption options[] = { AVFILTER_DEFINE_CLASS_EXT(format, "(no)format", options); -#if CONFIG_FORMAT_FILTER - -static const AVFilterPad avfilter_vf_format_inputs[] = { +static const AVFilterPad inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -154,6 +152,7 @@ static const AVFilterPad avfilter_vf_format_inputs[] = { }, }; +#if CONFIG_FORMAT_FILTER const AVFilter ff_vf_format = { .name = "format", .description = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."), @@ -166,7 +165,7 @@ const AVFilter ff_vf_format = { .flags = AVFILTER_FLAG_METADATA_ONLY, - FILTER_INPUTS(avfilter_vf_format_inputs), + FILTER_INPUTS(inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC(query_formats), @@ -174,15 +173,6 @@ const AVFilter ff_vf_format = { #endif /* CONFIG_FORMAT_FILTER */ #if CONFIG_NOFORMAT_FILTER - -static const AVFilterPad avfilter_vf_noformat_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .get_buffer.video = ff_null_get_video_buffer, - }, -}; - const AVFilter ff_vf_noformat = { .name = "noformat", .description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."), @@ -195,7 +185,7 @@ const AVFilter ff_vf_noformat = { .flags = AVFILTER_FLAG_METADATA_ONLY, - FILTER_INPUTS(avfilter_vf_noformat_inputs), + FILTER_INPUTS(inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC(query_formats),