From patchwork Sat Sep 11 23:42:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30162 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757808iov; Sat, 11 Sep 2021 16:43:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEU130jmpp4+Kl7XkjBiPwlB27raIK5epECV0UUAcdPJZkM1IrzJb3k6stnwfkreaSEqQ9 X-Received: by 2002:a17:906:ccca:: with SMTP id ot10mr4788526ejb.429.1631403839501; Sat, 11 Sep 2021 16:43:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n10si3716012edx.387.2021.09.11.16.43.59; Sat, 11 Sep 2021 16:43:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=lPEsCceJ; 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 654FB68A9C8; Sun, 12 Sep 2021 02:43:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068087.outbound.protection.outlook.com [40.92.68.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DE5668A8C7 for ; Sun, 12 Sep 2021 02:43:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U7muhZNz3yE3KgZ7bYXCseWqzmYx+d3hWByI0X1GCk5/kfVEJsE8L6llPQDqvjgQXgcWhtHr9L8ZWDY5MacmVXNp+AaoNXa1PQF116uZSoMfSWSbFf0ZzEoyo84nozj5uduMIiim8vaHZ+jke7V85vvrLW0DSVQyOxYR2HQNwN8PvIMm9KbyB+wOpI9buZPR92Fv8cyToH/lxwsknmtpuNVa5FP3O3P75aL0PHxLrP1bNrT4wUr35uYNJPDy13evK6SMToAbKtMe25npcZY1yPTY/0bCZfCzw841b2VINjhql5YP9PJjut629saFJvNCOf8WUiySe4sSRuhgq7logw== 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; bh=sUAhvUe1nqWm1wL6sm/QPSb98+iYRN4JomZfmGcKXPM=; b=ZQRlN9JycXRiD07bGao9pzzygQeMAeMZpvZ5HWasANsUNmVlV3w00smPLNgimgl7kiDe0ZBUEeFAp5Psn/UoehQKqfF7tRsS4lkTxjcxWhy/DfG8td1rGCjwDt9nNyWY7aD4JQ13N7TcenHtHJcZPovS7QhPlSA5CDO1PEm3QPB6kPvf7YlLIuOTU06SogZ/sKbEVM8Cp2D1yF6YapeJ5/nvKI+Wep4s94XQ5X5yG4yJl1oQmDUbvi0MJmc6v5R428N4QkRNj80G5npSTyMjOwWd1ord5an7FLYa01hc6TTa9SmNmQo2crXy/GBAiRP8Rvxyhhu1K9b481N7Vph4zg== 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=sUAhvUe1nqWm1wL6sm/QPSb98+iYRN4JomZfmGcKXPM=; b=lPEsCceJG5c05DiOvq1DTHeQx133mg6yyGmbyORdxi661UOJsvp6mnmRw1h0Uadfwj2DyBaSb3rEU2zTVnVZwCQsqdQ5xLo7glnKETCeYtTvq1AW/8QY6zm4S3ouQcty+Zqpzs+dnVXh292QSbyWzsLOCw+HurG64YsIYrXalyKcI5IdfGExiBnlMIuuh3oXJLxFrVYYF4Uk45mOYGdBd3iPMg+oi4CIVAdlzcOHpvC7Xp0+bmfUAKBQryson4m13hDFtriEaE3SnEWtQ9AszjkF6FGpHSKc81ecD6hBsTihFQH3JYrMXMam+FC64e6WKmUH4akNpa0lhj4INEpTjA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:42:59 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Sat, 11 Sep 2021 23:42:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:42:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/OE4nJlqFanevdeUNdUnhzrWKA5UQt0v] X-ClientProxiedBy: PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234244.2306938-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Sat, 11 Sep 2021 23:42:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 755ca485-e84e-4cc8-c655-08d9757de357 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9s0YsFf7lSoleFbGlJMRBOGfghekMmBOD38IsD62Eb52e5gTPfEYO6s7Hmx4nEE8d9MICZkO3Lu3niASThxs5vtsj0/iflNXvmp2KDwuuU7HKyN5HGnI8awWFsIBJ2Jh4+5A5bXxgBX7gMRPzPoBPBEYdBvXAcLNhvrN2huumj7wXCzvWxHkKSgTy92bulvaW3PodJtyyrtuQ2AMalxlDJ6n1k6wp+rgQWQpStdGwxsdB4Tr5L1mOwsJ8MOSQ6SIzq7Zbic3sZQm1HyK+6oMF6gC57nvxVNsMBZS8F+vlhEo7xtXf8kRkXXD1x9mUKR2+XCaamvwpvAnyf3cPw/hwNpG37LPHKzI6OdggJLIV1Yv7XzfIifLleZm1W6apKY8c4AYOLGHk0sXvO9YUSAbA1Z9W1zFlemo2TAXIrfAUUF6ONPUywXvB2CRsmuCbjDskC/eeRYuqHaH6v0+rdiov7cSx6pUT7jJJNQGo+eeeLHhstWraRFuE5dF44hQHoLJAiLFG2ZoA9WXRFKU5XPCDD7ZY9IeIV43tB1RjfC9yJlYEk3AovpZOfy3myo4eI7KxN5zWQAaF9UTr8nzmfzSeOGlQJHky6ObDOlEzN513FI0W5wf7R9FKQ48H52adFTGnK1XTudhvWM7EzCdVulBHf6+qoS+hKiA+SPYCGUKZL7hvqPNyNwPAirZ82H7ARnEK5uk5ueA7r5oskutBzuWcw17t97xXgzfjSen3mlAhNVSd3smIkk8Ekc8= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8uoqK9ekVfCYkxp527g5UH8bQA3KCMQO0QGB4j6xWjwS3R+BJcSxsG/uDb8HgLU+vpLURMo/vJMUwUG8HOSypjQ5WliSG3TcHdhs/9RCkOxrNx2/MF/rRb3HY12vh907lqSV4OR8oxR1/JSckO9nwNHr2dnVFYIIO9ufjNhjrInbYBGqEzf40877NUqIF/GqaaYDIQ2d2zMX22f8gL0UXHJ2BPUR4hSgbryj6ZcYWcWygGFKaqyZ8d+m8hYSYK1WcQEKRah7VXoLI7wK2NWYFZwKqR5Rciwd8InItI9UWjz4JHxkqxWNZirjBnxtR/VbD5W8cw1BTl6a3PtOc++HXaq0F8VpBpTZZ2FtX6EXkV1EUdQoFhQkyRNAqPYjgNpfB6Sy0C13l2ADPhqNlm8ylKz9IXYA/kzCP+zIt1O+3nS9N+FyuRFM0lhPLSju+t9f X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sRNQHnm1dsJtMGYtRADh0mPHZ9rU96lqNYICpp9SScPiYrvWKLl4GmRcX9kdkwbwyzMiJZ5dnZJ0vPAYTH+OCrUZW2UGCB6RG+RFZfSWuS5cs+jE9KNFz4UprGjKezt8ZOLDNTGE1foXb2jYO4PTHw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 755ca485-e84e-4cc8-c655-08d9757de357 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2021 23:42:59.7268 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 18/38] avfilter/vf_blend: Don't redefine options name 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: fWcfMsel5Kl4 Use AVFILTER_DEFINE_CLASS_EXT instead. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_blend.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 84f1e9f5bb..73fdea3c79 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -943,8 +943,7 @@ static int tblend_filter_frame(AVFilterLink *inlink, AVFrame *frame) return 0; } -#define tblend_options blend_options -AVFILTER_DEFINE_CLASS(tblend); +AVFILTER_DEFINE_CLASS_EXT(tblend, "tblend", blend_options); static const AVFilterPad tblend_inputs[] = { {