From patchwork Sun Mar 31 05:31:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94459pzb; Sat, 30 Mar 2024 22:32:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjYbnDTkxioBA78rMX3ZXurVRQ3T3ckgOrBh82g9vzNO6VTAqaxLxgTc7kCgnKZADNU7roLbYJlfIId9EhwLwzzt6vcagE5n/7GQ== X-Google-Smtp-Source: AGHT+IEyE3SsDQQJgtJ8NbiIa4Hz01xtxHY4qbTD3ddYhTFlJm5Jp0+xMMhHzjSQQxQbkij++NO+ X-Received: by 2002:a50:ed01:0:b0:56c:5a49:731 with SMTP id j1-20020a50ed01000000b0056c5a490731mr3926894eds.1.1711863133800; Sat, 30 Mar 2024 22:32:13 -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 w11-20020a056402268b00b0056c3f3852e1si3388664edd.404.2024.03.30.22.32.13; Sat, 30 Mar 2024 22:32:13 -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=YcKu6UFG; 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 426F768CAED; Sun, 31 Mar 2024 08:31:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C18BC68CC5A for ; Sun, 31 Mar 2024 08:31:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y+GDhiL3WsMIvlifVYQMURhfsG8I/hEzdxsM//iNNEriW0HLtuGpQys/c4FUzdncVl801/BmEUOoEIkH7aHrZ0dvAB8dARPPaPJYhyhL2F9bDEhHn9TAqlcRRLaMpMBXRBIQCuy+efsDGGcvVseN3rfJnMxJLfKcMM5TaIf0rqR7SptGMks8m/Wd4EwnCXNyuoAEVaJ9idQEcQhYUNq/vFvS7w2csOp7dM4OxSfGv+B5f5e2sv3o/PwKCrB52X4vQFpRWIQXoJlbC268E7nEgPVLCmawqu93/6iobGsJWy9dCerXe7KWbkfMg++jW2w6K8TH02QfEfrR/pcOGRsdHA== 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=nag54S20QP1QunSv7FqM6dXEb318wSVO6+05WT7dbxQ=; b=eKbrhs5WMbF5OOdr4ntatFehR0ukbVlRe0i+DuBT5qDsjxl+CtZJuAal+YHPP26+9mNh4cN70WnB/swhGby33evKhSaX0fBBaPMBgowcWt7TBCGqwzhyf3Ee4q87rFD3iU0AUEWqLKPxYdVkyIihY88bm/2tdxICcaOv+zUa2/S92NA+4j/wfFZKKWD9gxyK4NA+F57AsHnInj5w6tj4On8Jq2dKsMHrqJ6/LQwtWvSfdYf90aXVObAkNWKL6Mgw8v5doCd/XELLO7eZk/TZVRN6Oe9nqP+7hVrGW0gORz5I1GCXeu1yW4L/tvxQXuQkleI1vBbxK+OTgF2rReuPLw== 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=nag54S20QP1QunSv7FqM6dXEb318wSVO6+05WT7dbxQ=; b=YcKu6UFGmAiQYkYmphnMTeAqpk1oufqLsJq9Mu6rZvOzIgCXnmaXMvSSFGbYKUP6eBr42Z/g2pvY0+n7IzG9M3rNiLLHGDdXJiUwQBBu3uyg2TdJ01NIOGsKYVI1jcgjnq+6oaFQPQcWFRfXB28kuvYlT4siJZYY8PIPzuNqwpJXiQ/wWQ7g9mGPIFa9A+lwySXBkSLSQSevvhed1F9yeCVS35rf5d1YXWDRUN1gOLRCk1KcTiIITD02lc2Y/14neCQ8BRQsPaxUBgoNhj1mgEg72UNeyekEAvQQIkuFM0cRGeg0GYyOmzfOZflsDNBH5TNfKylnjO0otZ+DVTpuog== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:38 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [DCSSVHPAd2GCOWOSeCWFhmdOo6Xd6rXjYvBsQ2Ekzyo=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: 8be98a82-18fd-4bf9-1843-08dc5143d6b3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qwf3Ks0UcK3ZoCwuboaOjx0KZqkMK5mg6yYKgk9xfR3P4JnYcbUcbcrRzTudjzgDdPHrDdOzLrHTbgVGu1iJKl2Lc5wPFNvWN811P/kHfRUbmdGzipPJk9JWUs7BgWFsnHlmoEBhwlYY0hsbPx7blhc7qdD+eLE5EgOox3DZPz9u+2ZVjxG6GGFuuMXBkAlTTNikZ/u3lRaPzkm9z2N9w0tVeQ//IQ6PmcyoB0ltjBoFrN9Mj7EW8twXIB8zpqXM8cWn/148oz/9fTvZQiZgFFtX2yeOmnfezlYmcpKkJvKA8lsN/BHbYcn0lBey6LOtJkPbA6xsqrtHa7s7gEm4qVyj5P+dFaLCV6mMPIJ8A7vG+d8X1I8kevWKIWfA44or6XoE1lZELd9dbOdroN6Hnmg843MwS7l327PuU37U6xlExFIuWxTJybHksXpyusQOPX/dba4uXEk5LtYWfE0xWTbIHb9yhD3eVcv13COKEaqco4uXX45P9MHcwxfpcNFZoHwE4fds7Cfp+TET2EtMMUP6dNzefiWD2t55f84pfaHR2VXo/yG/FFrJqSe6IS5S5Bqbo1vqsgffMewxQnDSqX8jIwxpaH1TbOj4Uvygxl/2pHigDNAv+wb5He8Jlakx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8Ict16KkpwIwg8mgRRIiGg5uj9rfZqRphdxbA2pWy6MaqAo3ExKVUr9mLacdLwTkawlemvrjlSq7Ze524ZqwBbi4PtQtFPcHbeHdAr1OeMduk/ggLBOs7o1PsU7cZxcYOAWZHqEM6xU+Coy22CXGwdpzrpLcHeetO765nmL99WCU0pppchymCeIRpukB7rYlj1Rz+Ly5TzuGyle15U0MyXez1De4bHrx59jK1J5cOrpI2IvVtxF31oGwNeMTbUUGEYLhRyzYg/xxPiH+rXK7vkuRXGdasgGH+bBABIziR5Myflbi9ImKWj1x0N2mdGXirtEEdb5VxayGgM2I+Aad9tdaR7h7TlxaROFY94gELhPsAdopMCvMHfdTvomSc8tO0alMfwJT/jhKcSC4Mb4KHE4CiW6no0H+gK3DNWsqnj3XN5z9dkyODhpVS6gWemo9nZFTotr97ikiGdQTyMoHl2CUKXXPmRSJP78YTiV5YEpq6ac3AZvHY8+mjdNpQWgL2DCHFFqhPneEbDqbUp4ifi8U6HH1PTbpMIYnJ+37RVAt4o+iD6m5CcGrrBztvz6p4JUZUQXdNqVq2sWM/i06J1HkadApfKGYosHHOoKQCZsAYV4NzYJCK07I+thQPNThzCy7J4W4c9mOeY9CTDXeCMG0lZmaGjKmVqOxSvOH3s9aW80XryjONmbsJK119ZMFJjhHoEZd4Mwx8J+QsObQho0UtDIs4Bpg2SrvhAlRvUDDISK0oJdprCp6jU2I2ewnOIXRbL5aNI8YYgJVxSRCMgxVqqA+WMPJkLE74fmBvcWaDzd/3aNyDWDTkF1B12Jd6S8sxgl4VQgWuuOpQGGyDlPS/zRZRQTEI62y3zvo5RcIvJArKCUUF7v1pAC4vcrpedIQnDA/EJ/wGn/yQaln1aC5+I9zXCvP4xcAO22VP5UCMGmzmN2HuA9al14XIwzBCWRL7Kbs4NaZWaC1vnzAEQ2pNj4rqTfDpJ/7T2d5o5tqg1BfJk60rbCLkys7mTZWp3wXyz/gU8fmHqTRoU9XlAqZz4rNb11v+KA/NM0vvKrynnRE/QdcFpDgyFvTQn/sO6/5Z7AbsQAJOvsMiCdP4ONG5Z88OjKpa1GpouWOIW2cMbOTdtpSsT7r77kkdviV5xgF+rU5QPmxIUKDfpmR3jQECzoWGqHR/Q8xPX+Xn9P1rWNMDbxDsVmgg27zOjyJUpKx/qkROjCs13ognnabfEAX8Gb5usNcjwsG2e0WYP6Cq1BgGveLQQiRvsUCAyNLbIhxVq86bnCRZPrzliEFeg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8be98a82-18fd-4bf9-1843-08dc5143d6b3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:38.8278 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 07/10] avfilter/vf_hflip: 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: VU7PnbGdrQIW 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/hflip.h | 3 +-- libavfilter/vf_hflip.c | 8 -------- libavfilter/vf_hflip_init.h | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libavfilter/hflip.h b/libavfilter/hflip.h index 8532dc0f46..0d8b1025f3 100644 --- a/libavfilter/hflip.h +++ b/libavfilter/hflip.h @@ -22,10 +22,9 @@ #ifndef AVFILTER_HFLIP_H #define AVFILTER_HFLIP_H -#include "avfilter.h" +#include typedef struct FlipContext { - const AVClass *class; int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes int bayer_plus1; ///< 1 .. not a Bayer input format, 2 .. Bayer input format int planewidth[4]; ///< width of each plane diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index 09f4e08ea3..9f5958a392 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -26,7 +26,6 @@ #include -#include "libavutil/opt.h" #include "avfilter.h" #include "formats.h" #include "hflip.h" @@ -38,12 +37,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" -static const AVOption hflip_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(hflip); - static int query_formats(AVFilterContext *ctx) { AVFilterFormats *pix_fmts = NULL; @@ -155,7 +148,6 @@ const AVFilter ff_vf_hflip = { .name = "hflip", .description = NULL_IF_CONFIG_SMALL("Horizontally flip the input video."), .priv_size = sizeof(FlipContext), - .priv_class = &hflip_class, FILTER_INPUTS(avfilter_vf_hflip_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC(query_formats), diff --git a/libavfilter/vf_hflip_init.h b/libavfilter/vf_hflip_init.h index d0319f463d..5c1d69b2b6 100644 --- a/libavfilter/vf_hflip_init.h +++ b/libavfilter/vf_hflip_init.h @@ -26,6 +26,7 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" #include "hflip.h"