From patchwork Sun Sep 12 10:53:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30187 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084512iov; Sun, 12 Sep 2021 03:55:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXmcAIoWmwj+0Q26bs1dgxycToQbK/fJYiSIdSPcqajglyk3rUWYELwHDbGMMUzVYwKjuo X-Received: by 2002:a05:6402:28ad:: with SMTP id eg45mr5515737edb.226.1631444101575; Sun, 12 Sep 2021 03:55:01 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q12si1680550edh.51.2021.09.12.03.55.01; Sun, 12 Sep 2021 03:55:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=h+8GEwAe; 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 A89AE68A995; Sun, 12 Sep 2021 13:54:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2096.outbound.protection.outlook.com [40.92.91.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B3F968A1AB for ; Sun, 12 Sep 2021 13:54:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kl/1xPNyv8eYQfCouGxtuYNzTimw2/JClfzsQwt9UDGovRyUgfCRL5gYymsVvSvZIIEvNW6kToVsS/6nSn8f0iRLdQC7wAJgV0F0K+dka1V9jOa7C/fBpzKWCDZhLPHPZRAwDZlZe2YayU2W1ttWeU1C4+mqiZV02P/CGvsUPulwUVX0od3by9BSRSd//9UClLCN2bLOwxN/32SAANVWGsmGzZt+QGbOYXbQUMnGO1h1Sbq8SBUtrkcHDKEDU8qlCh+U2UQqOMHecxM5jeKYlZYth45dLwU0gzqYwpBECAP7aLW+dWPGioQfsaHtY3TjCLpEBdr7BKnNOhrIfA9OYA== 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=YUPraIbGpdTBlZwARow7sS+Jtx1XQa3okAsdGVAw6nE=; b=OHAszQsdDRKizBhQFbBtB6kfPRGicrSNFNxOUEsMpiqNrsh97ormmvu15DkYjWpjfKLyfvOJTjWvHwC4kR7esWIctwDBnTkEVs9/yF4WDL92cFLiDL2Kwn8BEALoHSvsOBxdczjeCAZ7eFHqPBXhYke1ZoTag2uOhFalMf0lueg09+OCxqJ4VNWObVeqb2VVQrHZC2K/x7XDngwJDr17apH2TeyUQvSzvuQkfIDn4iu5/G0tZkl5yQrS5VswSt6wjJ4F5XuYNjxvEAFF8Hzr/txi/hb3zAIQ7LWDnLEpQ22gaV4Xi0vX+9lp/wJRMl4asw3mmzLUGTwHZrxAKbG5cA== 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=YUPraIbGpdTBlZwARow7sS+Jtx1XQa3okAsdGVAw6nE=; b=h+8GEwAeeW4mpv3tTOD6LrgZEb5kbBGpTBxDH78T9L4vVg2lFE2AV432ynTGrcI0p+Bk65AfIy2SNc5Cur7pAYRtTw7PIpUfvabEL4H51X6PeghWZKlxd+3tXPQ6mqDGBwLGLlYPJGzze7JuZcQCBgBSiDgg84O9DU543pzFtXJmdKpojFi5ZwJLIwdGf2bNxERURxeuAo4UbV9uIeWBGk8OLNTeiRyirsuJONvdtmLPISdeqJCEKOc99woU0MMnYxKhZTbGP5Losf/kb6IoFqVJHPq2YTLF43l8VJDuKamsU6B/9NskUkLI37MBb/2ZhTCcAQWEDnN6cxXRgylJww== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:32 +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; Sun, 12 Sep 2021 10:54:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [PFci/fXwTZne9G7nxDn1riYrYU4qXdvr] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65d4ba33-7f13-47f1-17f6-08d975dbb3ac X-MS-Exchange-SLBlob-MailProps: vKxeIzzER/OoNofSaTKg7Jt3BsrGee2zmfJ22Lx1e5VwP/KD0feIZQOHpVw8BeQMHK9ljRtLjChycI25F6FyDjUkUj7DtBIT6aJoJ6sS3zC3FWg79/1WAn2uZHpBIIip0PsExMkoqQTvhcTOwZ2hyWed5t+YEfBeYVFo2bOebtWIYsWg975QUIU0tkH1mZbVb8Q9MWqrPTSBKkku2pc9v15d1fNxqAeEY4vg+bCNgeyuIEWfG/nUkUKr1vmKfV6n7BuIQkLf01N29rBFedmf7TixEmLIB6A+x1cXb8TZOs5SnDV2zsrV1chDPOX2znexOb60Nm2wRccNxA4d3fMeSpIyubs1n8cpfskEBvQhe0T90DNVeWuY0GJdUbu62IcQ7JYjIcqIZf+DhuEyx0HVdyBAOmFJSWORHyWrkl6OP13ajaGBfl2wHxS0GrdJu+n06MhQurr1XMoMMfuZAW2Kf2zEeRyZpKLo/eV9XFf+Z+VpJ6H4ZVlGPq87XcqJ5OXS+07ZhP/QImYasyfjuXBYtvKYqhRjJiA5NG5HoY8ubSe+dSxe5aBRvx50ldZRUFO1j/q93+ZeYmvwYC2It1AAkHbp5PYooV4xv2xObn29cmiKSz8JFef5Q4/dmPh8rgXkUk+E7zSPkAgJHfDGj7BzqRMBF94Fp74yeYVjoH+4rFHr90R64CHlsOS7dYSRw0K0DCztEEVMqtXm8hQbwWhb0BLFPIsdl/brAqhyJStRBKfy+yJM9eVTA0VN6eFkpXzO X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1xJeezrmj3TZGePLhmY2AGqmjrgm9YEES5g37KhVzBOKaw1iJ3k4smHAxseiF8bNSdpTggCB5Yv3YV5J1CqwZqUYkEzu5NXxy62OntSlsrWeDs6azgkluE42eNmqHFD6oJH0dGeXx0iTUpmAxih7CmAT9UAXMFkj0QOrYLFXVDapaJhqCZnE/OtuN6P3kEuTbZ/KxS2gVYciC2z6BKMFpAggUDjsNXA7sVjB/tdm6kHLQEoFR++N3MBT2AL8b2JrHLTMjk5sZmSt2oRQCO6fMlnN/Lm/illleVqwsGxJoxvL9Fi5xnn5TbCj/qWOyDZ+EjjTnlxGeBAvyqXlUbUFJ5617BG0KdQusWPKYmzWNySdbHzFtvRwf/mhJNlc81iz4OT2Pah4GVfArhFdiABojOqGcNiMx2wQ4Mm2KPpJN8M16JXzqVC+NC8JVva+2H0z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZK38f+R906i3JKzZYyDyNu5ettceFsUlPXefsYyiHOiRMzPLXeRi3zt09X0ETYrsDQMOBc1z8H4SVbkNF9b7ck+/WOwO9N/eqRV1KzGLAH/cplvuEhjc2CyZog7ebLMlct3vV11ybzIlkJBTLxLABw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65d4ba33-7f13-47f1-17f6-08d975dbb3ac X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:32.4444 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 28/38] avfilter/vf_swapuv: Remove empty options and AVClass 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: q/FWIBoM+uKX This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_swapuv.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index 0c285e547c..8c323873c3 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -23,24 +23,12 @@ * swap UV filter */ -#include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavutil/version.h" #include "avfilter.h" #include "formats.h" #include "internal.h" #include "video.h" -typedef struct SwapUVContext { - const AVClass *class; -} SwapUVContext; - -static const AVOption swapuv_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(swapuv); - static void do_swap(AVFrame *frame) { FFSWAP(uint8_t*, frame->data[1], frame->data[2]); @@ -113,8 +101,6 @@ const AVFilter ff_vf_swapuv = { .name = "swapuv", .description = NULL_IF_CONFIG_SMALL("Swap U and V components."), .query_formats = query_formats, - .priv_size = sizeof(SwapUVContext), - .priv_class = &swapuv_class, FILTER_INPUTS(swapuv_inputs), FILTER_OUTPUTS(swapuv_outputs), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,