From patchwork Mon Sep 13 22:52:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30220 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4445689iov; Mon, 13 Sep 2021 15:53:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwd6HNtkDK5k3d+ujdgX3k23pSMfXcJZqdMyOAv73HmiL62QGjHOahLwg4UMB4Ye+by8jgY X-Received: by 2002:a05:6402:386:: with SMTP id o6mr10252874edv.110.1631573605405; Mon, 13 Sep 2021 15:53:25 -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 hd10si8732112ejc.687.2021.09.13.15.53.24; Mon, 13 Sep 2021 15:53:25 -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=Z92XaZPJ; 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 0AB7168AE7C; Tue, 14 Sep 2021 01:53:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2033.outbound.protection.outlook.com [40.92.89.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2348368A903 for ; Tue, 14 Sep 2021 01:53:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SN4UMtMMbRWmspuFFNoWt5jnyTgPb3G4xOM6A17CKsUeDFS2FVC8RJiwSRRjBD86nYXwVV2Wt4FEyGcQwV5M0bQR6TArgdkiAih7WkaG0oGTGNGslAN5OaXhVxbM2bAyFoqgAOLyZLuBT/CRUkTiyfCBS9peXxQHL0VRk2Z7ci2HMmIfXghPqN25k9U5UEqy8B5gojfTW2u+nRczLWa+A4BWCydzkvAtrhPPE8pAU4A3sTlBEzeJLToKEtC/4K+2FGmPc8HGio4j7BpZuhVxe0/XY7PKjuaYTq7J88Ms/MTWu4B5f7QMfXeu8diojhfRUnB0ZRXzsNt1DQsAmTINWg== 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=Y0EJqKh3GKMQ5JG9hDkyZWR7mcd3Z6Ul1lE1hy4kQhc=; b=FgUtrO9jyZUFPDLPUcTtwvxkS4z2tmigbIqM4bjEeBpONtDtc6O4HlJt4BCEVpHYx0Am48/dbsCXZ8xXy8aWM/s8GIIiNd9H8k+UP2syKQSs5n1ASvtNo/a2W55yfBDylkTYh1EfPRy7wKtVw5+QUu4RBYUcnUcC/VVKDES3nktVFsgQ7vAwQDuLJjLodHltDtDS7tcaIIDiH+xoYfBaN8yZmFdWdJ6q0fPtmCOpma/08e4HL5Pd8uerV8IKLBmmOz0g9uX+hZXrAhG4E3NUNvvLOsdUnAai4e76IRQaQyf9KFFlim0LUUiKgD4oMttN1uRcw2h9yAfsCmzeDjjxDg== 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=Y0EJqKh3GKMQ5JG9hDkyZWR7mcd3Z6Ul1lE1hy4kQhc=; b=Z92XaZPJ7m7fh//DZZefPqmC5GGREQ/ESJBoCfcSoI79frbgcj5lg2OrIzLs/azMAb/7r6sgjWjY5OIQi7f1F3QHm4RugOKRmwcBIy3/UMCsYJ5dg3yBh7QSFKbb+vl8o/npiELOTM+0VPu3t0pniQtcFyZL6UVAUEyd4r32Sg0oqoM+AmuAR5IYLHGUlEgDrwzwdZFwVNTWIotHeIrZZSJtFUPZlS98MOkqEzhyOIVJbsUuQuO+wns0/KYzZanNvoJYjJSXGbgtJ0dAzJJeDi1aWA9HRzLz8UdL4DU1wlj+Uae9Fb/0me0O0DgjXtyP4rMp20Bt1bEzv17NQ2bBZA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6984.eurprd03.prod.outlook.com (2603:10a6:20b:29e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Mon, 13 Sep 2021 22:53:12 +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.019; Mon, 13 Sep 2021 22:53:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 00:52:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [y85NcRFWHd/QLH+eS8yffHbqyLJDSQ+k] X-ClientProxiedBy: PR3P193CA0009.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:50::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913225251.3115448-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0009.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:50::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 22:53:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39ebb8ba-ec2a-4a5f-37bb-08d9770941e6 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3V/TtV3mrfogUCq4JsxaBxF0bAmHOlmyRPtix0nybQdKYM2WrNdZMr5P0Zbbp8v6UGLxUPb0Div7FWm0s4tolfVVZaRxATVhAq1qrr8+POwhCahKsGhw1IIsZtzeGoCJM1l/xpQ1yQIujZfwcxRHtr4i1L/GEgN8tPVXulIA05wawsDXHR/Zbr1YaOJqcK3v4qK5oDe2DpXPp72hvLIRGlQc6HCOmPDJ7bPYXH3xe0Bi8AMnB3DKi6bBTecgTO2wGF34nYMqKthdx8QI9QTXDwRfTBge/8Dnzxl1LLtz5SZqGaEHoqwx918/ouJyF+XwiQ/ebeBrlviEd0R3DfSq7Q+K3WiWNIYWWQCNxXCUMsFEa5gOMM5SvoiDVKMAeGsVbdErz+AM56RcNo6vh7oRnegO29kGM1y+ffTR1C5z2IwrdlXZgPg3zpVeUDJvwbNHJEU0p0aT/hqC01b0d2CoTxXgNhoYsLqtMF9sNtz+U5/6HSjjqd5INMYpF+Aag5N+PR26UCw7ug+OJFyJt4tdTZIKtXGaWEZKBSlv4mqiddpq0k7r5vftXoX7iVZcKx/tpkuN4GX2+3xLjANutcDvgZaxmg+0b1FlhSz7TrwbTRDish/ojsAdKZhUlK62hCh2iv9qlreFY9hi9f+J6obbE8P299ToqCNRD4Dl19S1V4F25xW1SvuKW8UyN21GnvRyE36v2UWxblR8OQZflWYbhWKNei6FZnbffM= X-MS-TrafficTypeDiagnostic: AS8PR03MB6984: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VFNElXlybtaFS/M5hBRxkfuuEe78aDv7bNDonpQAbMXD4PZY1P2LH+JC5KA4CMYI45ycaToBDKhBiVKKNewLBxcOLkqrFI90xgI/d+L9hnDN3VfbeuAExt/iYg3d9azcJc/wXuoE+E2atSkVzR2I28TYHmDwSjfxqdrlZ11TF+cwhEngWcPbI0fuFC5VyDLoEuuMuRROcWBqVCxi2NUv1DmWJSu3DBOaad9YVDDhTQZGwd1TWzj/ThfM3NVv2I5LmSUTnW5OAPABmIA5tn0GldjDEzTWlMZ00zk1KzrFMLz8oA8J7BpRWSXIJJyzMPQ2ScODO/A17vmlUFkTN9sqOmShDX3Qfi3byrjvdGj6i38db+vSq3JkbN7natN+aCv6+u2XWySf1YXhlWe259TMtXKQjnopZw3ceybb1ePNe47Uikpd2HUG8iuvUIzwGs+xKDNlscj2NVQ0hY94B7qA6WJ9UiBJD4Dr8DFTyjR/1oo= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6VOUD/qswHf7zNc6dv8M8+bwi7yA6uAw6eZorOKr0omDsiSd3LWc2pvBitVc7XBydBFOJGsqfyi0cUKsXp9N5wI54z/yC3gDUzbKYhcLKMjq3lR9D12/a6r3yoVZgYbt3jKNDWWo8oVTJEZHi4B/ng== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39ebb8ba-ec2a-4a5f-37bb-08d9770941e6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 22:53:12.1511 (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: AS8PR03MB6984 Subject: [FFmpeg-devel] [PATCH v2 01/14] avfilter/vsrc_testsrc: Deduplicate AVClasses 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: 68tLmGsfyEe6 Signed-off-by: Andreas Rheinhardt --- I am not resending all the deduplication patches; they can be e.g. found here: https://github.com/mkver/FFmpeg/commits/avfilter_deduplication libavfilter/vsrc_testsrc.c | 47 +++++++++++++------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 646e8257aa..414950c442 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -409,10 +409,9 @@ const AVFilter ff_vsrc_haldclutsrc = { }; #endif /* CONFIG_HALDCLUTSRC_FILTER */ -#if CONFIG_NULLSRC_FILTER +AVFILTER_DEFINE_CLASS_EXT(nullsrc_yuvtestsrc, "nullsrc/yuvtestsrc", options); -#define nullsrc_options options -AVFILTER_DEFINE_CLASS(nullsrc); +#if CONFIG_NULLSRC_FILTER static void nullsrc_fill_picture(AVFilterContext *ctx, AVFrame *picref) { } @@ -435,11 +434,11 @@ static const AVFilterPad nullsrc_outputs[] = { const AVFilter ff_vsrc_nullsrc = { .name = "nullsrc", .description = NULL_IF_CONFIG_SMALL("Null video source, return unprocessed video frames."), + .priv_class = &nullsrc_yuvtestsrc_class, .init = nullsrc_init, .uninit = uninit, .activate = activate, .priv_size = sizeof(TestSourceContext), - .priv_class = &nullsrc_class, .inputs = NULL, FILTER_OUTPUTS(nullsrc_outputs), }; @@ -1124,9 +1123,6 @@ const AVFilter ff_vsrc_rgbtestsrc = { #if CONFIG_YUVTESTSRC_FILTER -#define yuvtestsrc_options options -AVFILTER_DEFINE_CLASS(yuvtestsrc); - static void yuvtest_fill_picture8(AVFilterContext *ctx, AVFrame *frame) { int x, y, w = frame->width, h = frame->height / 3; @@ -1283,7 +1279,7 @@ const AVFilter ff_vsrc_yuvtestsrc = { .name = "yuvtestsrc", .description = NULL_IF_CONFIG_SMALL("Generate YUV test pattern."), .priv_size = sizeof(TestSourceContext), - .priv_class = &yuvtestsrc_class, + .priv_class = &nullsrc_yuvtestsrc_class, .init = yuvtest_init, .uninit = uninit, .query_formats = yuvtest_query_formats, @@ -1418,10 +1414,9 @@ static const AVFilterPad smptebars_outputs[] = { }, }; -#if CONFIG_PAL75BARS_FILTER +AVFILTER_DEFINE_CLASS_EXT(palbars, "pal(75|100)bars", options); -#define pal75bars_options options -AVFILTER_DEFINE_CLASS(pal75bars); +#if CONFIG_PAL75BARS_FILTER static void pal75bars_fill_picture(AVFilterContext *ctx, AVFrame *picref) { @@ -1455,8 +1450,8 @@ static av_cold int pal75bars_init(AVFilterContext *ctx) const AVFilter ff_vsrc_pal75bars = { .name = "pal75bars", .description = NULL_IF_CONFIG_SMALL("Generate PAL 75% color bars."), + .priv_class = &palbars_class, .priv_size = sizeof(TestSourceContext), - .priv_class = &pal75bars_class, .init = pal75bars_init, .uninit = uninit, .query_formats = smptebars_query_formats, @@ -1469,9 +1464,6 @@ const AVFilter ff_vsrc_pal75bars = { #if CONFIG_PAL100BARS_FILTER -#define pal100bars_options options -AVFILTER_DEFINE_CLASS(pal100bars); - static void pal100bars_fill_picture(AVFilterContext *ctx, AVFrame *picref) { TestSourceContext *test = ctx->priv; @@ -1502,8 +1494,8 @@ static av_cold int pal100bars_init(AVFilterContext *ctx) const AVFilter ff_vsrc_pal100bars = { .name = "pal100bars", .description = NULL_IF_CONFIG_SMALL("Generate PAL 100% color bars."), + .priv_class = &palbars_class, .priv_size = sizeof(TestSourceContext), - .priv_class = &pal100bars_class, .init = pal100bars_init, .uninit = uninit, .query_formats = smptebars_query_formats, @@ -1514,10 +1506,9 @@ const AVFilter ff_vsrc_pal100bars = { #endif /* CONFIG_PAL100BARS_FILTER */ -#if CONFIG_SMPTEBARS_FILTER +AVFILTER_DEFINE_CLASS_EXT(smptebars, "smpte(hd)bars", options); -#define smptebars_options options -AVFILTER_DEFINE_CLASS(smptebars); +#if CONFIG_SMPTEBARS_FILTER static void smptebars_fill_picture(AVFilterContext *ctx, AVFrame *picref) { @@ -1584,9 +1575,6 @@ const AVFilter ff_vsrc_smptebars = { #if CONFIG_SMPTEHDBARS_FILTER -#define smptehdbars_options options -AVFILTER_DEFINE_CLASS(smptehdbars); - static void smptehdbars_fill_picture(AVFilterContext *ctx, AVFrame *picref) { TestSourceContext *test = ctx->priv; @@ -1676,8 +1664,8 @@ static av_cold int smptehdbars_init(AVFilterContext *ctx) const AVFilter ff_vsrc_smptehdbars = { .name = "smptehdbars", .description = NULL_IF_CONFIG_SMALL("Generate SMPTE HD color bars."), + .priv_class = &smptebars_class, .priv_size = sizeof(TestSourceContext), - .priv_class = &smptehdbars_class, .init = smptehdbars_init, .uninit = uninit, .query_formats = smptebars_query_formats, @@ -1689,10 +1677,10 @@ const AVFilter ff_vsrc_smptehdbars = { #endif /* CONFIG_SMPTEHDBARS_FILTER */ #endif /* CONFIG_SMPTEBARS_FILTER || CONFIG_SMPTEHDBARS_FILTER */ -#if CONFIG_ALLYUV_FILTER +AVFILTER_DEFINE_CLASS_EXT(allyuv_allrgb, "allyuv/allrgb", + &options[NOSIZE_OPTIONS_OFFSET]); -#define allyuv_options &options[NOSIZE_OPTIONS_OFFSET] -AVFILTER_DEFINE_CLASS(allyuv); +#if CONFIG_ALLYUV_FILTER static void allyuv_fill_picture(AVFilterContext *ctx, AVFrame *frame) { @@ -1751,7 +1739,7 @@ const AVFilter ff_vsrc_allyuv = { .name = "allyuv", .description = NULL_IF_CONFIG_SMALL("Generate all yuv colors."), .priv_size = sizeof(TestSourceContext), - .priv_class = &allyuv_class, + .priv_class = &allyuv_allrgb_class, .init = allyuv_init, .uninit = uninit, .query_formats = allyuv_query_formats, @@ -1764,9 +1752,6 @@ const AVFilter ff_vsrc_allyuv = { #if CONFIG_ALLRGB_FILTER -#define allrgb_options &options[NOSIZE_OPTIONS_OFFSET] -AVFILTER_DEFINE_CLASS(allrgb); - static void allrgb_fill_picture(AVFilterContext *ctx, AVFrame *frame) { unsigned x, y; @@ -1824,7 +1809,7 @@ const AVFilter ff_vsrc_allrgb = { .name = "allrgb", .description = NULL_IF_CONFIG_SMALL("Generate all RGB colors."), .priv_size = sizeof(TestSourceContext), - .priv_class = &allrgb_class, + .priv_class = &allyuv_allrgb_class, .init = allrgb_init, .uninit = uninit, .query_formats = allrgb_query_formats, From patchwork Mon Sep 13 23:23:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466480iov; Mon, 13 Sep 2021 16:24:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF0eZLDqBfbkMRMO+11/mV7AI0q9D6/zfelEJcD6fdSjgd2gndorPISdMW+TiG7vIzBd9V X-Received: by 2002:a05:6402:cae:: with SMTP id cn14mr6521136edb.212.1631575463954; Mon, 13 Sep 2021 16:24:23 -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 o1si12298083ejy.319.2021.09.13.16.24.00; Mon, 13 Sep 2021 16:24:23 -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=Y6Je4dfP; 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 5E8A568A79F; Tue, 14 Sep 2021 02:23:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071028.outbound.protection.outlook.com [40.92.71.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9234768AA7B for ; Tue, 14 Sep 2021 02:23:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eB/B7HPtV/sXTYu62x1QFPQOuPDWag9lunfAQ3QpczrbBJLB7pneQUAUvtDfTixJ4SPEGSXo1st1o4X2bk5AigyAyJ6l6NhY4+Lyl7yigpfLeGR3TcNU4Tk79gHVt9NOsHepU8nzonrIQ8Ta7vr/9yHW0da2L2OKhCSY1wDfERG/bm14dlnZ6UXjklSTIXFika3SHktqH6JqjN+pcJ20Bhj3mtnc5leG5Ux2ANiv/bNG7kUNg9v8LeyDwG9RJgCPMHxEgEdvSEAucgI2ebeHQ18yKKdAFvGEoA/F36/drNDirsYoro2t34zYUj7JmEivwoCurDxeHDl6eu7lZrqHiw== 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=3GuOoEzLoKh+0MM9Aef+dDcuEOUbn+STa7lokrDwmSw=; b=anMXlhRUM/bRGz3+MKaa739fNuqk7r0dCJv5b4nytfRpqRtYRJMDFmo5eEZw/dB2our1mOp0NaKxJI4rwLe0UKvFPKhfH4O2+YTcoHVIrVM7VH196QnfLLQIht5z8MShTMwinlq8tz70GSemU5GQ6sn5lY7ZDiwjMliYUo3SDB872/piRu8CQkH4gVQRrLR3pVXZhh2Xg7yA6368TlEzTgAJwpXu4ICiktOwQdkKlmozyQNcoIPnTKKMBW5YLnM73M/Vukm2BW8iOgwJEEhFLbK7aS9RCUBQ2BK1IdhFdL/OKYuiZfsxomXavq3UhEDSnjnfYnVnsDq7h3cEV5YLaQ== 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=3GuOoEzLoKh+0MM9Aef+dDcuEOUbn+STa7lokrDwmSw=; b=Y6Je4dfP3j61ByejVHyQAyzxET24NKJPq/ymPDYKXJxu/4MyuFpY4A1V+pc+ALKCuDmHjX1iJ/7vtMnx1ba2K3J2PS9l/E0mCrC7KtK6i64QofzjRTfDaX4YQkJpkdTD5m/hQlzr+i5r7TFzkmbFUrGWeKozdOUruzJGA1/9rzCE5UtwoihGHeuwxoIaubdAfp/Y/9aTH0Ma06vn+M7QgpmPTSaXMimfeOL7QVHO2QpbZ/krxja6zRv9HmQjjA6Dq2MnA8FFfrfZOR0Cd8jEksdwjHPsT+46+rSeBHN+NzDIvYlDn5esy34AAA4vHIOm69Js+WLCm0QSwO+HCNt6/w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:23:47 +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.019; Mon, 13 Sep 2021 23:23:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [gK1qrYygD1+zhFbiJ5c23L0wZEUfoAXD] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:23:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6a75a35c-5b5b-4c77-cf55-08d9770d898e X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3V/TtV3mrfogUCq4JsxaBxFUrzSLOzwGNTN4KOmw6dokqKdthFhwaxwOa7foDRXHzTyDRLZX6w5dd8j3n+u75gTZJf+2J5fTLmZGR5z0dZx6/JbklcKlw/bHgBvjBVl/7sJ/YqF9Fp3D291uqDLCSRJw3dtqBkhpJa5QpHqqh9rSi1Zvwsol3Idu+hVzlROYlqTtEAljmoiv2AECgD63/nCXTS9C9+K84sDJIO/E+5kOX3965JSk8lF3qErEFzGZ+DkQ5QOd50EmxVoAA3840rZ6Oq9qAwS4sJa2/BrR/bNKZjAQpERabxb8tls8gsNzUXDfAtWMuOS9ke2VzjdpIB6+ol0BYHeLraYRzcqxuQO8MDvVuvSknhlFc2zPo4IrzttjG5ndzpivrxY4IiuIhBTnowsVv98e/HpNyIFMMF87N44ZnWuupc5SacY0kmA6hCVGieJ8oogWEOPmAcazvg2ibQ702bqE9fljNrkDd2jCqpPMrWsWmevC5gkQCBRT+kCt0u+OQl3qW3EdNfLtqsO8xO+Q7vB/RzYJ3T8Kt0wNJBlckA0A54yzE97DURM5hmA+GDaT6oR5HDyLZvnKXI+0ltWfyIJITRQ1R14ITqZqub5CL3rQ5PwhIVhN1o+Gi0BP33gjFPfxDtA+r5iyEOcx0ZYAUcv+wytFITDfZpsRXww8sHSLpZyrm4Q7EKiLrPuQxqpH3U12sCAFSSJDHw5ZDDicC+4MfM= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fpb7dZeA7QHNdMdOHWbZqFDdJeCpvVIwvHGcIhje+6AJSJPBLsrdDH/p6wK6MMSxb2zRofdsZVzQ5PRqzlEZT2PcW76SOMGULELfviyI6JYJzz1lv0TD0BSMsJC5x/9eRp4skZUH2iP0oHw0bmISlXJd7yuGtU0LQY2Znr6uAMV2wdaVi6iqht8zm8asW1XmFosqAGOTZa0/iggXAD7P8vM3UcdnHfhMiTLRzdf8SnH8AWLgcZr9w6Hb1lAHl39ZFP0DKQEkqRCZ/cSEmVhax2EcOvclzZVEWwQZxR4/bcDrkfucSICIPDrm/UetbxCDT1H5BUfBC0V8bNazuEg+v0GtLTQU9T29LFeKDaWFcaeJohQ3xbyA8lW9L94aDCAAvifkQVJa1QLW+DhsCHuuSB+XpznnPJdeGm2RB8AYKCWfg7gOB65Kmkr2OdPWtM39 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qG2zNkrpeM6JCPeQIU8TJ3lMTsL9Zd98662PJ5JcGZWKo52pbj0UD4eww20EBKSjgta5lYI4vqmvZME1twC5m3OM8xQhGHLwfx3lZPYFG4kB/tTvrdkxRqKe6wr0RM4eZ4v/vOtRcoh28NS9OYySeA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a75a35c-5b5b-4c77-cf55-08d9770d898e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:23:47.8053 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 02/14] avfilter/vf_scale: Deduplicate AVClasses 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: jnd4h0Nz+gwl Signed-off-by: Andreas Rheinhardt --- This one is new. libavfilter/vf_scale.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 6c7f4dc9ab..a1902a13cf 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -967,7 +967,7 @@ static const AVOption scale_options[] = { }; static const AVClass scale_class = { - .class_name = "scale", + .class_name = "scale(2ref)", .item_name = av_default_item_name, .option = scale_options, .version = LIBAVUTIL_VERSION_INT, @@ -1004,15 +1004,6 @@ const AVFilter ff_vf_scale = { .process_command = process_command, }; -static const AVClass scale2ref_class = { - .class_name = "scale2ref", - .item_name = av_default_item_name, - .option = scale_options, - .version = LIBAVUTIL_VERSION_INT, - .category = AV_CLASS_CATEGORY_FILTER, - .child_class_iterate = child_class_iterate, -}; - static const AVFilterPad avfilter_vf_scale2ref_inputs[] = { { .name = "default", @@ -1048,7 +1039,7 @@ const AVFilter ff_vf_scale2ref = { .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(ScaleContext), - .priv_class = &scale2ref_class, + .priv_class = &scale_class, FILTER_INPUTS(avfilter_vf_scale2ref_inputs), FILTER_OUTPUTS(avfilter_vf_scale2ref_outputs), .process_command = process_command, From patchwork Mon Sep 13 23:23:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466582iov; Mon, 13 Sep 2021 16:24:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJqQW7FYQ2kh8SJm01qaZ95lQ2o+lugAE/ggcPeimyXZ0LgbU2l0FQosROcjB4/ffD33kK X-Received: by 2002:a17:906:781:: with SMTP id l1mr15652377ejc.289.1631575474401; Mon, 13 Sep 2021 16:24: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 jy11si3173719ejc.732.2021.09.13.16.24.11; Mon, 13 Sep 2021 16:24: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=rdg2m12w; 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 8699E68AEB1; Tue, 14 Sep 2021 02:24:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071014.outbound.protection.outlook.com [40.92.71.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71CC268AE97 for ; Tue, 14 Sep 2021 02:24:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ewVNgQqMvJpVhlGah9hoIWq1d4BhKt8UhUKtr3AQ6d6pwYdSQQyjFivYGy/LNbBjlszMrzNWEfTw80C90075MaMxXCmG4W61UjClp3tKIiFLkzYTS+y1PhaEXsiIfDnlNs66YoqLZni+migW2pjV/Nvd58LdMHA71+ZzkYkB5Q54p7T2r0MHOPRWSg7r2sZFh6Iv2jE2o4xnB/4G9xM6NnSo42ucymKMj4lbSbeD3Dcp3H7ZeyNZM5pC/dxBvUsqas1Pt39pdDDXlGwY3vmoCUfBhqEideKc8sh6pcRmgeDhLfR+cG74cPm3ru9zsJiVMdnILRdL4kBmntYe8f9GVQ== 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=oSz8yoTe72FJMyiqiL1VyH/Gh1Ine9q9+F8lR4cHrac=; b=lmu+IhAjXC7ISbqcxtf4ZjD9rfu9NFPxY3FW1u/5ArMRQRpBKGGKp+J0cnv+lDOY9PCsDzqgeIqd/voi5837Jg+kub7bQuDZCEN4rDQbX9IrruwcjAY7Q8tbdEapS18sl7cPHII+B2WNabvh2ignmeA0fkX822gu/NNlf32dwuKJzacDGYEXpG8547APMzuKgffytKKoa/0Mpcxv0LbixdWaaG+bUYqGLpQ6mftGYijsu0aIeOF7iVc0wIvhg4GfbWI35HzG/Cunfb3ez23uJDya9ErVqK2HdYdrKY2EDnE+A+xVQA2SjTPeU1WtwmTiAb8TklRWWM1CQpA3NwwIKw== 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=oSz8yoTe72FJMyiqiL1VyH/Gh1Ine9q9+F8lR4cHrac=; b=rdg2m12woQpt7VGhv9X5KesLN63K1zGe3NizGhQ/THtF+fOiOsF/6yv4veryOc9rSGmud4v1PqenD3SJfXx+IXPKoOqAk6lDvZVK7dleRST3Q7es9ImXoqDkHMGwnLanOUOhiTIr1CMadphSOzEAboA5LAJnrgy7OE4fcVhJU/mf/NpaYuZdZTKR9gB48wNiur2K/G/jgXlT4e/+KcBm1G7BGBRKLrnerum42OQzoGrWG3BmRmohQu/4c7DOHc9W4ebTMh9+1rlP4ralQkJKXaXFWbq/0kmwGolLMVuFs+WpmE5Q+jwix7FR9nMjntyvhCxkAxB/gHcFNIRmqmEWlA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:23: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.019; Mon, 13 Sep 2021 23:23:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Ji/UH/cS4UDzWa+0v9YBTDCj/0F3+xcH] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:23:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8337efa9-f6d9-4d82-33fd-08d9770d904c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXSr2fKdz7sYt6AgME9bwCsuWhcqm48B4un/UEwce26OHs1ijkfbSPl985E855P8QouJlPJEwr/cv86MDxVZgOv1KNDeyZYZoD87yAfds0zsfuXN8KZIvWbcEWkXoKLY8GsQrrCoWJ6rC+1a2JpogSPKssxToLKH/A4U1v0x8H1Gjl1bj2Vlwqx70FPYxIWq+6tZAY+Ei8IGE1L+6SkFxvTY95Kbm+hJw26E/HkAmeuONKj328uzrTirTYEnHZyyAZRx3YeulSgnyIA9qLh5Sz7xzZeuu9jKEgwc5WJexruBFttIWhuxTTE4CrHn6e+20zTxrKETY6Yn1xkCgcpAFvYKGxD/xVRuHCmDClL7gLzU4Kedgk2cdxWA2vaY7oSiJd3/crVo+JYICzMWnrSsJs64Yu2Z9ze8RKL3TXseW9x+7KqZN0WnQ/o+zzCkS3zdEC6CUFvSxVoVyd9Sz5VjLMaPq0Bh6CT2ZwgA3qiwsQmiUtmh4hAk0+DiZsp8bGYMNB7UxU+Iv8HcfJORnxc+C1is2V1oQYa5pGp2vfUrNn/EOTInSdYMZEJ1MMTp+VRVilgiaBsnsfL6qzTZCVO9WmTRO0iIVDJ42VH3dRSxYyDsgWxRTXEvuEoHE6bpPtGA5R+rZZ9hy1onTrWK3dNvvM6/F8jR7JqA2Cq/SndNlxry5AaMNKAHoVsDQzsY2Nv52SugPyvUum1RQOK4XHm8KuBUu4ZEtNd18E= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h4/RlC5gdoyW28E6rZYQkpK37FQMrvpXcHmpa8YlRToazVZTOvm27oxFXfyOyAcz9PVZKzQHFbbStDM2yItTxeV1brU4m7MtktCI53oF+vjs7mr1OgJm294douC8xkvynIPKg59fib4xzYtkvnVKhqNzSuUKhleAmvE8WdU/gohUNd2JiPsvfOccswdgEl/n9c1+G2kiZ0GF0+lU1E3xr5wZ//7O7pm1jZDefNI4uXz2WtOg7XyzX5rEcmJepnZ+2qMB0MFxDgLhcr32g4+TSDkBObAlJXH+rS0tGHWgVO/L0q60iEaJmWtkAFvBd8yDTQlnl2EUz/5rdj7dUAoeip53BI2NcZHJiIonwHkbKdYk3ytyb0BrrNxkPejGnbz+5wK0F5TiKUChjaTVKPzT6waima3LQgIXa2D5gcgqP97T525kGmLG8YzBztHr7h4U X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oMbOIuptk7UQPI4adeLe+nrc7u8PfqFBP9a/cOe4bZUOPH+HIW2kwkN6s/FJH6R7k3QZjsj/MpDxzAuelXMv0zBwEY4gP8Eyopl9NndONrENV6g04vXdoocScF8yd7nH2NWuQAtbiJ9hap/CC/Cogg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8337efa9-f6d9-4d82-33fd-08d9770d904c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:23:59.1397 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 03/14] avfilter/vf_readeia608: Use av_dict_set_int() 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: C64eI9YTCNy0 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_readeia608.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/vf_readeia608.c b/libavfilter/vf_readeia608.c index 2d6d0653a1..5ce2e75213 100644 --- a/libavfilter/vf_readeia608.c +++ b/libavfilter/vf_readeia608.c @@ -491,8 +491,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) av_dict_set(&in->metadata, key, value, 0); snprintf(key, sizeof(key), "lavfi.readeia608.%d.line", nb_found); - snprintf(value, sizeof(value), "%d", scan->nb_line); - av_dict_set(&in->metadata, key, value, 0); + av_dict_set_int(&in->metadata, key, scan->nb_line, 0); nb_found++; } From patchwork Mon Sep 13 23:23:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30236 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466646iov; Mon, 13 Sep 2021 16:24:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwC1pKISau5StFkMIiITtq3SEpgM+1Hkpv9BISi6MvWnwoACPecLox2IPLg36vdpr307z1D X-Received: by 2002:a05:6402:697:: with SMTP id f23mr15472410edy.253.1631575481251; Mon, 13 Sep 2021 16:24:41 -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 r24si8799933eds.399.2021.09.13.16.24.21; Mon, 13 Sep 2021 16:24:41 -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=Zl9pMFJG; 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 B35F868AEBD; Tue, 14 Sep 2021 02:24:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071014.outbound.protection.outlook.com [40.92.71.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9723868AB29 for ; Tue, 14 Sep 2021 02:24:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xkn7wF4kIfqkRCTMxsaK2K0FuCKTe4GxJ/D65AWu3JV1ffyDB6Dj71ttQhbYDOu10hDIUKQGRuCz6pjgMp93uoiT/GWtPmgjDaalYplHqbwnqmcXudwVCO25KvU5x0YyXuokQW5mI7mzzbbkCSaPBvxCkLQzIq3X6VJnvfTmePWGrrGVvBnWRelar9TQ04DbLVVvLfWjDGbZsOEogDblQcas0GutR352ndWuz58541KR/eo0y9B3o9qZAPNJ/+tB07FWZEEwq9BdEuajxF1Kf+nEZtk2sDpnTR7VnYA4Ce+VlwTRkbf2NHxB9mBXQtmyNrvtt3HY0dGYRjacY58agw== 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=jxyBMMN2q2OO8VvAGWCklBK3su3jbKPOLIVLLhsPgW8=; b=BjSWRBA1wHjGFNqUco2Tyww5zvRjzuDsTeS8YVJXxJ3pF0syAscLoi3CpX5rw10q/cAgpzlMEtQvM/e+5cyJC1++DSeM+pFX9Z+JtroqdiCylOcndh4Nbm39RDYCeyA0FkfBsmpowsmjXxE94ptEqMOlYifpb114kUqWeGXeNsvXPoLqeRePCNOR5JoBY4+PxzHp+VaZ0eMYXQ5VRVlU5nRM0xFwLQRnBU+ZMT1QrF4Aj7DfAJAp5a/1e4tVjziEx02102fAlE7W5pt9mTFmPAUKFQUFtDkCwC/FFPrMmk4N4zpuA7rAnsNCBb2jra1T6ILYeQpT58WRyuN/rpcJ0w== 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=jxyBMMN2q2OO8VvAGWCklBK3su3jbKPOLIVLLhsPgW8=; b=Zl9pMFJGwYyQkAH7ts5deOFqz1TFqqO8b8S+P8H4n2lSusD+JvV1dTXkbTPlnhD0EWX57VK6EmGq2PkmgrLvHW2pLIxOmuAa+yH0UzCWk9xMqSu6CTwbk05hK1HrIxV9tFEQvnZzQbgz/YV0Gii3hpf6XXsZU5y9RjLdEFVxfSuRMU0CBzT3xJxxv3KGofikHps9pfX1CJXdbQlw2DhTP8/H8lJDXRLERY+K3l9cC39w6ARGR88cOEBtbtCwTQiJTRX6PXpLqEl3Nes02+0YHQlAKZBT3Q2+2y90ROlKxVbnWp5kG6yAgrw7eC8+XScqoL7o8NFYul+MQEiO52lqqw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:01 +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.019; Mon, 13 Sep 2021 23:24:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [uGQCdI6YQZ2mqZjRByLAVK8wFAhJldrt] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 977889b6-398b-4076-eb49-08d9770d91b0 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ0H+K4Wek5UQBrLJju5Y35G4Su8Ac/QUX3KzCHSVDmABJT6n0yXnhaRJKueiOcFiUButSgowWKYJaoLvN1phwR25kYqwuuupc1yc33QwNPt6l63acYCh8J3TaIpnZIvNyqrDu/NikFu0ptxc3akzTugMK+mDGMezXVeiNzWf3TrUnmtRCq+dmfWGFttn7RmziMKWwPV6fnhQqOIyNl4NWPaTO7Qc3Lx2fuBkgfDOsq6gN5JyaozghykyKaG1P0Wc1ZDFFA1AvQdQ0/BTv3gbT+zuf8HWy6sZTIkcV5H0LE4v0zE/3MxCiHjJmlHtbAQrvQg+SF73jhr+qZlk1HYBJRvHY+bjVc1IA9go/T+YfNwBGwPFtRHtkqXQ+tQJXAHDUFlw4DccCXpIsb7Ae8mf71ylErefxxVY641w/xYjyxxTm8w++jlvdBL5Cbbx0cifKu5BSfYMQRVaFFL/A+qmUQDGio7h4wZ8soi1IisWYX7qDvRkvBEQ7qRpvNtRbUWQRibYzRK4q2kh1NQjTUbm93PbYOs3IJbHBoYFFSVx7H1sm56g9M+p41M94Ky7YHy8ESsnWDPvKHVMb954SJx/X9vmKzvVgUBOnvjlL8tk/AwBhr9Bb4UlQQNmUeLQDclG3uCXu6wCIT1EXmp3CXe94hwiXKfqNOVrdwtVlCyqqa5c0ZZgVV2p2P8yR5DC513AXBrd+H114uzw== X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KGD7MqH1V06wRB3x+nLyT001jI2DZaBEvjWz9Pa4tl9NUMxm04feARIz/AgNoAD3t0zDqAk7VtgMqkxrRBBP+V5TJGObKNMCaXaayUGhYPLLCVGXn9p2vlJ3THTlpeBUI4C0rDOCfLE7w/oJ5Kx+iAkPYWrLW0EOWFK0tvNChY2w4813B3rCXAYJGao49CRhf8E5RUwNzMeVcOy/XdszlfE9hlCMdyF7WzQ80N4TCfDqV6JTcKLPiQM8wYJSoS5+r9aVOgWPOtjokO6WdC2BZZt9dUf9LcaNoeuZx7ujdp7wea6dMW5cnvmXzqVEuoxvRAzSqlfBoXg7vHsXOrMLO3MWzYa/YF2goRZufFHTJj8Cj/WXsiSAlscRhZZD+v4ZTY0nVVqCkPIBsY+rtNpiim2ovcxrcrnJshFu8tan9D0myRE/lHeLZ5CTK2zQt1nE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i2sqgVY8U47uI7pAnrnj5ZmrF+SeRuvhcT+ZggpikqbAL+twMk0EdQKWu+EUNSKUmPEpTJJlVNzHtCbohZ34Wij3RQr5uZa8asqvV+9UPRjCH4/+yclOs8lfGmwvjvQd2YNd9uEKRG0cjbqCu+FNKw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 977889b6-398b-4076-eb49-08d9770d91b0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:01.4845 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 04/14] avformat/rtsp: Use av_dict_set_int() 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: Q5wobRjt8Jl5 Signed-off-by: Andreas Rheinhardt --- libavformat/rtsp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 3772a7f2a9..a3e9b9a1a2 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -122,12 +122,9 @@ static const AVOption rtp_options[] = { static AVDictionary *map_to_opts(RTSPState *rt) { AVDictionary *opts = NULL; - char buf[256]; - snprintf(buf, sizeof(buf), "%d", rt->buffer_size); - av_dict_set(&opts, "buffer_size", buf, 0); - snprintf(buf, sizeof(buf), "%d", rt->pkt_size); - av_dict_set(&opts, "pkt_size", buf, 0); + av_dict_set_int(&opts, "buffer_size", rt->buffer_size, 0); + av_dict_set_int(&opts, "pkt_size", rt->pkt_size, 0); return opts; } From patchwork Mon Sep 13 23:23:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30232 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466596iov; Mon, 13 Sep 2021 16:24:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytaECEWtubocz9oxbW5AtiYY8a9RfMwtPTshDRp7vnxF39FUB37gKvVpi8hOnrc/lGuTOS X-Received: by 2002:a17:906:16d4:: with SMTP id t20mr3952445ejd.482.1631575476008; Mon, 13 Sep 2021 16:24:36 -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 mq9si8696727ejc.683.2021.09.13.16.24.31; Mon, 13 Sep 2021 16:24:36 -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=kqgFC2GC; 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 CBB7B68AEC8; Tue, 14 Sep 2021 02:24:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071014.outbound.protection.outlook.com [40.92.71.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA22B68AAFE for ; Tue, 14 Sep 2021 02:24:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MNoCcZVFFkamBLPb4QPIanwnJFvXIEBMW2CjWfKi1n5eFRt7qt6/I1NmKv2uzXG/4QA95DYY6cCWUpFsVg4TSgOpzfWPZ2VtA3SsNq+xflTrgTH3ANMlsGchsbkh5uakFWOhF+sLZQNNKBseHc376TqhaVDJut3adIYTFfyUIr7aol99DQ3foyJTj+XlKdr0Y8LFv01qdyMG/gPT7YonN4Sr47Gx6oGfgrDEp9e0aXZintATVvR4rrU53uhZ8MvvGLIsXxkoRxDz8hYN2xHCFc95zQ0zGvnvsDCFPuBfjsxbW/yHt+BesbMV9CwZoalV9qfOchKo1zVaz/nHXG9AAw== 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=HlmwhWBBI4g2otoLu+McLcp71qGIR8imQusJfGJntFU=; b=ixR5wTllM8JKH7irh45ZpHdrkoVCA8/7P85JaF/dmZ8ytLT4l9w00kouPhlmX1jxmcwBdAJHXoaNG6eChv8WgGxkw4Ry5EbhhFAtOoEQ0SzWWrYf+ICikSF4fGeopAsoJv1pqGPCmG549VYpzlFScovI0iv5IqUj/HRjR0jvGUDK9C5zCSaU5/X6gN8BUHteRPCjfFEWBNyygmhW514NvR2B6LmdYigu/n2bkIqE3i2FCpyyYlNSBVLa0h5dS1GmMPR8Kg6/K0pRci3Q7P9tLUQDJLZfljIZLgjl/rJfY6NFqRRdn710PLiCvD8u5ZEgqHyYG54xIwiFTJHlbPwedw== 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=HlmwhWBBI4g2otoLu+McLcp71qGIR8imQusJfGJntFU=; b=kqgFC2GCZeYc1xlBNcj1rNcxtrDzY26njgHejTg0YCdp9/36o7E3cnMxh2lj3SxacpGR+ZbKR4Bc+FwFDm8Er59AF2n6EeMGk9SY4hoZgHVED6KP/xmgrrNkYwfF5z6Ymwb8vuXF9FZZsTas9XBh1/HUuJNQ0x6vfctG281JAkQZHv18xyARfz2TjEF/uqrBrlmOGnEU4DYqbhbA0IREUL3SY5DzSB3Z/avWM+JM3jNWRvgLcr8RMVnYYJ6GPWsaRX7C+8m9HbksTwjD3TaYf5loUJKvW8q6n4mHkA6f87Od8n+pZKNctavpHY0LqvKoEpb/Z86ZhV57wmQGXkZIzw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:09 +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.019; Mon, 13 Sep 2021 23:24:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tuyr+h3r0l53K2dWtLzpcuc8CIwNXUio] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3fe2e810-de89-4abb-7910-08d9770d9632 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXSr2fKdz7sYt6AgME9bwCs/KSzd5g3dswfpeFttlBxAlefOKWyAvZpQuvK/3iVI38ORcJxlW+siA/lSQXh5BcZoiiRWS9A4+N68yWusdb9WFKCvvkDQVgAh++aqMgul1OCUrfuHwNqVN+kAsZ5qg1OTqItgCDTqoJ1aYcgeQ8d7aAFB29AlaVIV1ATTrd1abHqLQaEJRuM2V1cHFHbckvRxJchEEd+uxPl225U7rA5txyghJF8Mm6iV93r7lmpCXXrPkPz1Un1vdLsOkDt6diT6gZtSjncNmj5RJ/PAuLfSe2DaeXkuGCuUlt3F0kFTUlQ1v+Lm0zvxZr9w58cf5gEjbjPXu2yUapXSWkA9SvSmyAX+k6ID9fFvTgltpi+Buj8MU/JmdANgCrIfNeZCM5ajKA8+2JyuxUAUsfHV1m0jbcJSHww9TdmQCLKYOU8xoq+IM9HeIH1/HyyTyoYBJD9YlF7wARXg2F/8T/2+kriS0xXBPzXkQ3IHaFF83L/pYqPgEYl/R5M6PbNB134XufRrjfQZ9Lp8AjUSGHgCnlATEK3P1psieW9DA7r9BzPgVGv5/ShDLKpMqP5vVTP3f+Kn81cLcvEN4FiHSXIzMma+9Z1Dn++1gofnZAix7oopBeFgeFTGL4bqrgxKn5Sg9UbNJXzSc4Vwcr06IpYCx5hw0yrx5e4LmxnVxb26YWynp8g8YknDv4Hd69WFbMXWw463GVIvgQr17U= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N2Wfrpbk0AdVFvad6qevQvHHVrGURch1M2rtb9Dj/zu1bihnkEXr6B3rATB7cPCqhx9FpcRPvxaOFNwa/nZa5qX+EN+PY7qkr2NzdIf+UVoh2RUYFgoCXLhlACVG2bdqbIaY8CTjUtGSwLJ6rpZlF3fF/UnlEzFhR12FmRh88XBKKE6xFUyFFPavX5qSQJ4iqdyOwtopwaLxYM+tUmYlwmb/cxNNab42JNoLQmFh5DwfsRZyvdM4PRJihAPiUZGwU5RzCyUpSIzEnoqTOp9xY6h+4RFpv/TgSBgS35Hprq6vtZmK5/EjhrEhM9OTzNWeIh3Di366zmspnOJ1Qtd/a+CczNJCtTUzeh+8wWN/2Klu1b8TsyoaFc5XjqPgAERHxpHAAxIM2rdZg9w4/V8ZLAYsK71p4gUrHLe2Yw6egMCfQ4bzf2WxE6ppyuhYSKJ5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kD66ehmuOElIBFoEfWjYssrRSYlyvO+Lx+D/2kXwP4/wnHNgfoiHlcD4wDO4lVUzaXqEiYFAzsi2qZPe5j+n8blY769O9jVarxVmm78Uo3lWk6iN0x/fPTE6wHLB+DeH4OjRhUfUGSStZ+6qEofsog== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3fe2e810-de89-4abb-7910-08d9770d9632 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:08.9608 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 05/14] avfilter/af_aresample: Use preinit instead of init_dict 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: fPFrx4lut1kD By using preinit, the SwrContext already exists directly after allocating the filter, so that the filter's AVClass's child_next becomes usable for setting options with the AV_OPT_SEARCH_CHILDREN search flag. This means that it is no longer necessary to use the init_dict callback for this filter. Furthermore, the earlier code did not abide by the documentation of the init_dict callback at all: Instead of only returning the options that have not been recognized it always returned all options on any av_opt_set() error and errored out in this case; yet if the error was just caused by an unrecognized option, it should not error out at all and instead return said option. This behaviour has been inherited by avfilter_init_dict(), contradicting its documentation. This is also fixed by this commit. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aresample.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index e46369b98d..8e0eaee17b 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -43,31 +43,16 @@ typedef struct AResampleContext { int more_data; } AResampleContext; -static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts) +static av_cold int preinit(AVFilterContext *ctx) { AResampleContext *aresample = ctx->priv; - int ret = 0; aresample->next_pts = AV_NOPTS_VALUE; aresample->swr = swr_alloc(); - if (!aresample->swr) { - ret = AVERROR(ENOMEM); - goto end; - } - - if (opts) { - AVDictionaryEntry *e = NULL; + if (!aresample->swr) + return AVERROR(ENOMEM); - while ((e = av_dict_get(*opts, "", e, AV_DICT_IGNORE_SUFFIX))) { - if ((ret = av_opt_set(aresample->swr, e->key, e->value, 0)) < 0) - goto end; - } - av_dict_free(opts); - } - if (aresample->sample_rate_arg > 0) - av_opt_set_int(aresample->swr, "osr", aresample->sample_rate_arg, 0); -end: - return ret; + return 0; } static av_cold void uninit(AVFilterContext *ctx) @@ -90,6 +75,8 @@ static int query_formats(AVFilterContext *ctx) AVFilterChannelLayouts *in_layouts, *out_layouts; int ret; + if (aresample->sample_rate_arg > 0) + av_opt_set_int(aresample->swr, "osr", aresample->sample_rate_arg, 0); av_opt_get_sample_fmt(aresample->swr, "osf", 0, &out_format); av_opt_get_int(aresample->swr, "osr", 0, &out_rate); av_opt_get_int(aresample->swr, "ocl", 0, &out_layout); @@ -343,7 +330,7 @@ static const AVFilterPad aresample_outputs[] = { const AVFilter ff_af_aresample = { .name = "aresample", .description = NULL_IF_CONFIG_SMALL("Resample audio data."), - .init_dict = init_dict, + .preinit = preinit, .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(AResampleContext), From patchwork Mon Sep 13 23:23:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30234 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466663iov; Mon, 13 Sep 2021 16:24:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1YWMtnYJqyYSo+4l5zBNqFNdYc5qr6Qhp3CjWRV/HYohuxBQLwzowgpai+ArLBu+cMi89 X-Received: by 2002:a17:906:4346:: with SMTP id z6mr15406467ejm.403.1631575483177; Mon, 13 Sep 2021 16:24:43 -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 d1si4539623ede.162.2021.09.13.16.24.42; Mon, 13 Sep 2021 16:24:43 -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=o2pdvKSc; 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 8FAF968AED2; Tue, 14 Sep 2021 02:24:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071014.outbound.protection.outlook.com [40.92.71.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA40468AAFE for ; Tue, 14 Sep 2021 02:24:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cUJP4dySpMo3fRxsTZsz3x2C0h0AXmVY0ta/3+R5tQ3tNvz66//nOrj9fJZhytefvQAjGDP7iiwMeOe6/B2pkesAjAYqGQufp8XrVe9mw3ELXRghqBiCjgvJwztZksEC6U6UooaxF4ffvUw8DZZkxZj+g7ufKJX5rN/9CfyGDQPpXYvgXOGo4KnlvE2d55JB9pHDEP8i/GClbkk+IGSD9LYWCeKqkVOZM2WjR+lDR0ouBXH5LiQknIyFCE5zwkEPC8KMaRyviE9Fg+AC5Qr+8YZWb7dM2zc2T5Tizn9T+RJ/bFup0Wy0z3mpLIioLHjuAgqnqtH8309me4w//I2JbA== 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=wNL3NNqEBDI0BlFLtV0DvwSmuIKxy+5b2hIUTHGvIIc=; b=YBAxDF9ABDllumTCF4kj/EYSAdinLgOsosfWavKHvCsIy7+qcA8YBeZH4qra1mxD+t+WaY/rN482NvxX8YP5STUcUdhvZ23pX1gGnTuhmLPYu/rq+aoFGI8udysrYhzqA3dNf3Q2SW1Of3p1wLfTDlsEb9XXK7klPgNom6oG5KEBS1nqOqFbItHh2URRXA7/8TBlt5aP1DDcQvXBuzGtTAQMDaWMLXH3xQJx5ZriuiMH6vkYP45dQqWBuabqbJPdQRdqGceXifdA3CCjzDWp+MoLT8aWkCb2l2wMFuXZ0q3Vo6S20bukE3GPb0tKieIEXsRkzOyAUdUhPOqB/CX+Eg== 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=wNL3NNqEBDI0BlFLtV0DvwSmuIKxy+5b2hIUTHGvIIc=; b=o2pdvKSc5FomabSs+2tj3sxVrhCb2O5Jr/EgJ7cDkRntu5g6yI6tjora9INmoZWbiupnekgLU2rfMeHaiwkuzcrvxAnMw5iBFz66M76GYKUYFb3rwO+ijeNlJcH+83LLR2DlAV3z57igXXa37Gvs8d2ZQ7VSC5M9RNwE5cfsuRWz1ikKSrcgy7rSrIB86qI/nZXMiIv1LO+T+jQ3vJBJsktTIOmwkg6JC3wrvCfII/FS6g2Mbdxz5QCbtlMEynxkIcV1HpX0U8YmWqlb4/JkGp/kM0gbf0W1OOhpNH16OxYprORlx198Z7yeXEDJaxmn1b1q9rFA73Ta7Ck2QSTYXQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:10 +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.019; Mon, 13 Sep 2021 23:24:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:31 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [d6qUybnpOEPWAww+p5Q/oFaQ1XpVDFBn] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fbda5dbd-89c1-4fbf-2d72-08d9770d974f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSwGI4buAwfZe0futHLJHOz9md3MY9BfGlfNK6WvFDPI8QpiUQ5HSVyUHHhqgh2j2ugRk485GXWAjDFk6ALk8CDfIYvJEAzhf2iHjU9jvBOuAuJr3ZI0VSq1NjR6SjUqivt4wJFoX46RdYeQrYw/6cQKtfqyvU4wU+PGL3PN/AJiHgyB2bQ2TwSt4j4YdGgiwJ9DJy0vybI8h1nreP6trSOOLcTD+gpvbyLgFSeV0MF0PYSEGoSxP6H2hS50LVVXCWeImiXY9enU45VdcmEA13NhPQMF/+Gd9KqilYvRiA8pr0uG2dqMwL6oGMytJssQxOo1SzspN71jPv9G+R/FqJ1wxvGs5UdD1Sl2xpfPosHju62nx/RFHUwiyVhIZbC2o+3f0TTz+sW6xtIkssXP21u2k4joNZ95oiDY3vlZfeN8MHqi0vp32IuZQJ4H7O4Y7hLfFb3dAGDfceoUCbZaKaPnQvs1EInL9sclA9PeVmhVcC3fdqpag1ah/suANbjLxIFJQfOvklna4ttegwDlEwBXrsVRDsomwquiPn2Clgvu/cDh8pGtymhiXSvW0TSc2drW+dT81JZUHXw9ISN2GZzTDSXRBdUxIhzznq9nNAfhzQ9QyQ3DOtZ6HMlIe/dzU6xQU8BH5oXTTPl/t+CxaG7JedZdZSeC3B9dC6j2XxHEvswrIO5pBaSWR8B4MZW6zdw+MTMbxVymr+3GATiJKW+wp1SvFjJd13rXTR+A+IKhsHYW/hD3rQfjTykyC8CamA= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8+A61blXsXZ5GuxMSBj2aMU/B/AwoIun9WhJ1ET2ye4hu0buYYbNAVeabNoqtt35HS/ogR3J9PePehDrvjftr9tNdlZIY/+qUbQ72edecKjYwh8KNTGiD7kb4TabJptgoc/fcvRliFJc2kWrG05OP637zfLA5WPDV++UsKjS2kocLtxpCf883ra9LE21sb/uqZASBB2L9np+9Q3daog0fHXb9jHUThitoJQq9wkJg77u+K+r9MNXq+qks+8SEpvi6TjpV+2zBi8MBAdH8dTN/UbMTE01vkeXVHpAdQhLzt75+4RG7fJt9kIZWgcVNsJ/DicxOhIQgZpLIwyL7niCC29XPTl19wIK73nNZxJVadt1vw3Y0T6vQTnNGv/ArwSkJlDe2J13OJWWODPxvlnY4ekMP18ZQVxs6RaMQG3ayLYXV6mtX9VWMnIP1vOCalfk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8yECJz3B7AWM73HtKHTd7ULlcCAoS28wtJpgCEkpp4IxlhQOUNYH63RR7cGUEz/H+UWG2n7+85SMOGuOFw9ccqnCL34MLqiHoVLidB/dgilp0PZJSweWfrhrPiAvMWWetW18QK9wRXAJFEV+UCZuwg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbda5dbd-89c1-4fbf-2d72-08d9770d974f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:10.8386 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 06/14] avfilter/vf_spp: Use preinit instead of init_dict 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: 6ltgCtE3Ir+a By using preinit, the AVDCT already exists directly after allocating the filter, so that the filter's AVClass's child_next becomes usable for setting options with the AV_OPT_SEARCH_CHILDREN search flag. This means that it is no longer necessary to use the init_dict callback for this filter. Furthermore, the earlier code did not abide by the documentation of the init_dict callback at all: Instead of only returning the options that have not been recognized it always returned all options on any av_opt_set() error and errored out in this case, even if it is just an unrecognized option. This behaviour has been inherited by avfilter_init_dict(), contradicting its documentation. This is also fixed in this commit. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_spp.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index b3a52fc99b..6c15dbaf66 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -338,6 +338,12 @@ static int config_input(AVFilterLink *inlink) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); const int bps = desc->comp[0].depth; + s->store_slice = store_slice_c; + switch (s->mode) { + case MODE_HARD: s->requantize = hardthresh_c; break; + case MODE_SOFT: s->requantize = softthresh_c; break; + } + av_opt_set_int(s->dct, "bits_per_sample", bps, 0); avcodec_dct_init(s->dct); @@ -451,30 +457,14 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return AVERROR(ENOSYS); } -static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts) +static av_cold int preinit(AVFilterContext *ctx) { SPPContext *s = ctx->priv; - int ret; s->dct = avcodec_dct_alloc(); if (!s->dct) return AVERROR(ENOMEM); - if (opts) { - AVDictionaryEntry *e = NULL; - - while ((e = av_dict_get(*opts, "", e, AV_DICT_IGNORE_SUFFIX))) { - if ((ret = av_opt_set(s->dct, e->key, e->value, 0)) < 0) - return ret; - } - av_dict_free(opts); - } - - s->store_slice = store_slice_c; - switch (s->mode) { - case MODE_HARD: s->requantize = hardthresh_c; break; - case MODE_SOFT: s->requantize = softthresh_c; break; - } return 0; } @@ -508,7 +498,7 @@ const AVFilter ff_vf_spp = { .name = "spp", .description = NULL_IF_CONFIG_SMALL("Apply a simple post processing filter."), .priv_size = sizeof(SPPContext), - .init_dict = init_dict, + .preinit = preinit, .uninit = uninit, .query_formats = query_formats, FILTER_INPUTS(spp_inputs), From patchwork Mon Sep 13 23:23:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466736iov; Mon, 13 Sep 2021 16:24:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw93Vo1hua+tNz46XkRZvYJzEp9zpyDi7tcMbvoA+Ig/mUMz3wgGPgP4y4xql/LYjNaqaOx X-Received: by 2002:a17:906:401:: with SMTP id d1mr16090131eja.242.1631575491734; Mon, 13 Sep 2021 16:24:51 -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 z8si8484537edc.287.2021.09.13.16.24.51; Mon, 13 Sep 2021 16:24:51 -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=iCEYUSaA; 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 6C28368AEDA; Tue, 14 Sep 2021 02:24:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071035.outbound.protection.outlook.com [40.92.71.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AEC068AED0 for ; Tue, 14 Sep 2021 02:24:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E6jPtUmdKaO/9iqPcK6OXX/FEvj2OpEK00t/zlP0LWwgEkyjebp3nZXw44qlLIiNjQXDOI8axR3h7E9lV2M2du6YvQX12GlnMvEZn8Fj5P608Sk+SQIrcj8oFp6/9CMEUbOFVemXBWOW/K7E3MlazHtDD0j7Q7Yzy5i5lOoFcpifZP8SLdfOWgH/hOvhCPVfRSpd5+UG/lnThesCTj3crK/DBYv7ZthkktshvFmu6XA3jR2xXnvrvDcaogS3Bul7XT1WDIqahRIXJPqBaYxN1ksEZvY/38qC3CnziHB/IgRxZBL0fDtwDA2kqoj+r0IDhLHtro9DV4haebRJDs2/OQ== 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=HCmJIkLVPTWBRbQuEntT05efVBPJUAEfAMvG2qO5kHY=; b=Dfz4pNP57HubD+iAZq52n7P5vN6cRvg8ZryAzIIuI71P5j1PHM/5L2Qvk+H+yOkauEdH5kg1DLBNam859bbMUiThP9zdWjX61qRA23+KfAH0GHWX1CdJBXzWHJTq7OJaQBV3Q2wA5gUadioy4u0+R3nuLsZgVndwGhzphrKffF5FnWUACuPCdHbJ/qjwujOuhuJ9v9DaZSCkhhpnQsBIAQRrZDYDz3RPifxn0pxMYnOYV4ie19t7pkBrEaliA5/wVW71RlW7aCgthd9l5bPCHgybhEesbkSDL1MEd3MUvO+mNRjVJ2ml3eKnlfiZ84WIyH/crnYU3PTbc0Yx3xWWrQ== 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=HCmJIkLVPTWBRbQuEntT05efVBPJUAEfAMvG2qO5kHY=; b=iCEYUSaAcTJTZUK1WWCvnsnkeoy/sCHoBQm8ClcBDP5hbQuvcaam+vyDSWm4NOLHLKUqfBWhSkZYFUlWwqp1rwiF55GfZP77kyoWJuOy2q2Su9mcHdj2RYBO0MtQgJI1+d55VVlZW0PTqbyfGBd/Ek/lGYXquDjeqmEI37U2uevJKY9c0czSDX42gIHpI3gc/cDQtAe0sqRfc3w+GZBZKiMOeulnk//bpNqMBXfK7kMxb7Hcn8hAZ4sl/Wue3FParjbJOnDFW4GNUkbt2SpAaY/xisKQrGshfqY1KAXx5UDGBKP+6gNjAixMLvOlWah+1J5VCyEp0Vi1Nv+s2RqT/A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:16 +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.019; Mon, 13 Sep 2021 23:24:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [S0lA3J7uU0gk3LfnAP5BimXQJLBYE+lZ] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3033350-1bea-4e55-3e82-08d9770d9ac1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSwGI4buAwfZe0futHLJHOz0QDEUDGZHWb/cSG2yZKffuhOiG4jCbmtEXCqz4v8l7KqSeiepVBIuwva0EHpcUfmvldulW/6palHEQ2U/BwZ7ne0jlGlrRFRV3w9MZ8zWR3He1IS92Lt79YwVkbFopYMjaKsfpTQWfKey/02uoHvlU/gxIRQ/V3pG6JQWtmOLbfEbhR6fdj4aB+d8svwkiTetUUwzRrSo3Hs6lNDoXy39DQsLDMIZEwGrEeimwXWgoOV2g661lKUCRYChzWgm991JhzoJX5uOdunRbgRz+2LIzw59VUH/frv+jtlN5B7A0+jXF60ECNiQC6HB5g9gWO0ozEQHyuSdDS6h8d+kKeCvDEtK88szTc1lknlSeUbW/HFTPt95chuGvK70a/JnGoYqEIh5YjXVEocl8/XqGgRRzrBCWbROOdcHS6yDnX8uG+PjJA6DlwyiqYu0XJu+btBam0m5Xs+z+xeIJy4R/sUMYoCm4u3KSFFPSMPmvGuN4jFweBfrigpkawvrSLTB6PhyaCdbs0VYRnhVYR7qpNbTrGrUi0m06lWrsvFaxehHRsn2HgCrkyPE8CzPVCSwIoLqYXG4Pe/7MZTWZ1D54c0AMZCJk/AaCbVdPgJTjkWmgWizCNwjvLk2sTpZ5OapWgncHLPCSFemByec5MpUsV59bWicmIwdJun3X6dKF4LL8BKakt4lSZx5cLnjSd4CrXD9OE1sv+Y0yqmh01NgAkIAQRsc2MY0E60EsXlwziSjww= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LU5DRG0EnXmv4d2Domduu8WaXiE7/rdqzp8OtpEJxKBUBcNp6Z6dGjE8Deo61YYNo80TTG9gmvI1jJPkaz5IaPwSXRjezidArXanFYuAkdy0HGE5VDJWryTgk2Afqn3+66jBCkubkOtJUn8A1hLXrf4xNQ6jL5suojlK7qB1Nwc456Yf8n4hPOg0pZTcvy62wDfrgM8tPQYOioOiMSrsJIM4Rj+qvvVwxI53rszflsOwO+ZJqvxzL35TFn8GbV4OvBFUjT2daer8YNOCzCc2R0lAtl4s4zjuiUZ8Pd8ZJBS5HOpVg9Vnsdb0+hSxM1uEqjDhfzm6CiWcJ0sCpNO6sUAEX5cb8Ia2Bn5Mat9dn1S/Qha1W1SfeUK6hCFEpy2nU7HLXGfPhFhSKlaqIvHAn1F8KPrkDDoDHEOZfae8CdIAqbo26qyi3xDs/w0TE+Yz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: InX17H+nb0wnLj1a3wA7Qjww+P+/mZTUFnYNC90ZcH1fAmtYsC6qoIQMPCc6WO4XBygxlYs6ISw1/LQHZiMjvCQb1Pf29gEoKn9Avrip5DNB0LmlhjSM614wpyd3Gt2zf0Gyt6grj1QU9gfHoP769Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3033350-1bea-4e55-3e82-08d9770d9ac1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:16.6541 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 07/14] avfilter/vf_spp: Add dummy element to array to avoid shift 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: +p/J9StSDcWF Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_spp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 6c15dbaf66..b9b5f7bc78 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -93,7 +93,8 @@ DECLARE_ALIGNED(8, static const uint8_t, ldither)[8][8] = { { 42, 26, 38, 22, 41, 25, 37, 21 }, }; -static const uint8_t offset[127][2] = { +static const uint8_t offset[128][2] = { + {0,0}, // unused {0,0}, {0,0}, {4,4}, // quality = 1 {0,0}, {2,2}, {6,4}, {4,6}, // quality = 2 @@ -283,8 +284,8 @@ static void filter(SPPContext *p, uint8_t *dst, uint8_t *src, qp = FFMAX(1, ff_norm_qscale(qp, p->qscale_type)); } for (i = 0; i < count; i++) { - const int x1 = x + offset[i + count - 1][0]; - const int y1 = y + offset[i + count - 1][1]; + const int x1 = x + offset[i + count][0]; + const int y1 = y + offset[i + count][1]; const int index = x1 + y1*linesize; p->dct->get_pixels_unaligned(block, p->src + sample_bytes*index, sample_bytes*linesize); p->dct->fdct(block); From patchwork Mon Sep 13 23:23:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30226 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466810iov; Mon, 13 Sep 2021 16:25:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQzzSs0eV3txct36AOiwXtAI6Tt27gGWeXl2u5BDNb2EqzREiFe8K7o+2VqJmq/o2Tzpdq X-Received: by 2002:a17:906:1749:: with SMTP id d9mr12346628eje.178.1631575500543; Mon, 13 Sep 2021 16:25:00 -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 q2si8546344ejf.24.2021.09.13.16.25.00; Mon, 13 Sep 2021 16:25:00 -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=g5PfVpKL; 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 69B5A68AEE4; Tue, 14 Sep 2021 02:24:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071041.outbound.protection.outlook.com [40.92.71.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9DBC68AEC7 for ; Tue, 14 Sep 2021 02:24:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jQJDWuwiGgt4IKu6rFnoi8wafuxKDWXHVuce7nSuGVzRZzYM1OzKNiEE/Jbcob9V/d54ZwZD8aS8WkGrdmearPVAl+I2Hbt8DafDOb0GL6gsqn/yoG/VBqsT9pu2BPRlgumCGreBndjPu+fvutumiDFrJTWMimAaHEDjMij50kK9Qr7GIObYZkHh3+B2RTwYb2zi+SFKDOr8vexYTgt3z9N7c4obkcwEXfmg8LKU3CkHP2XLZ9pH0FDoCbM4eg5vtYQvrMyyANiZ5cubVAppikocEeoChThXeK/tzM0Z1gkWgo7MXVxX7bgor6W2CDPWqN0SvGwPXMLLa/+dsTWFNw== 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=WRX6kMU0/w9qtwwu33GimDL/SG946nY+ZTa3Q1MiGVg=; b=criJvkFQuFmKzah4oshqCNY4g72mpzYwt001WhxuZDKlZ6/VTu8WzE58uWSGujDkItfEXNTi4XQNdC26OKIr8+7IuPkFRQ+6GFgrjxB/hj9/weP2xrSl5m5/OoXAw/1K70/PPbp250/1VIo4yY/+dXIWTS1fUs3EQnXqinb8lTNkavMAB/mwtBkBthV91/ZQmGlpQJzMn9ONOLhGsrNj6frZusb1Kdq2LOo2QGaogOUY5dMBpdvDRaPPfbjxlncpkB2YRPjxNDGfJb9Na8lVNRfnIMNk/hj65gFJXyMgs6POypliw0G7G+YLxnbEXc6wjz77BLqg8n0FvU2syqTM6Q== 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=WRX6kMU0/w9qtwwu33GimDL/SG946nY+ZTa3Q1MiGVg=; b=g5PfVpKLhFNMn7ybxZBl93WZ3zy0ty3FiuFeh9R6YUzcHFYrORFAlp4A8hUjp8/L8taZG/dDoN7p1PU/MbXUDuPOi09T+rxx5chNL3Z2INnihi2pCX5Drpme2IyK22fTGkbI3ek9SSInGzs0S5epHfptUUBygXQUXh761iZj0etVx0Ls4jmCNzmOQD+TrSa9/JaktOxTCN5LVJGBNGUt/dNdbR3gxoMsnWTKaGA17f2seQHmWz+tFYXKQVdm9PM+KzxM+axNGkdQrGK5x+1rkBSkFhLCrlL1jyKtIJo0aBu35qlj1Fz5qlN0IU6/IT1XHov4gTJ6OlrB+neJ8TBiyA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:23 +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.019; Mon, 13 Sep 2021 23:24:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [db+w3JSid7pdC2fX2LmfKOpTeSYSOzoq] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76fbcf56-225d-418b-ecae-08d9770d9ea6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSwGI4buAwfZe0futHLJHOz9md3MY9BfGlfNK6WvFDPI0wbXEUlvhb3J4JtoUh3hIoAngJM3bpbJksYdF6YmYEWU66fiOZMVV4pvprXXuu0HKVt60FErpNN2w44VUIpWWwSBCTbkKiUfSgw2FeqEWbBmkSEsob4gYouWAm0O4Rx08yq8e99UtVjovBbQz/QkwPfIuRr4FuStbL+2fDGod9L5CXS0Dn0G0BxN1Ewk8RhAAirEW4iaw/GBvYQBvtLT6WeJcScFatPHg2w3ds6n9WTgnpk7AWydDBYI63QMMcYHX7JblOkRFWZVfSdTPgTDguZ58Te8oQSziI+IBJx0T0wkCFlUCXS701NKCDGs/fvxZ6731V1SOLQKAoAiIXiPohyVGtcvAyfKQVj5ldZmv9k1Z+lec5W8Fo/3m1qoxt+Jqg5d3iCZF8ZjMtrXxBf5MGnpRCvDw3WGtbLaLzdtZeyovKH7mT0E0KKQD/Sbih/suGoZdbd0RL5Vki+dguTSHSRZnlXRJMo16018sYEqwlrSASl6gp/sl2pCn+w7TvUTSxvP2+ZRvbLY5wketv1n/bEnAFoi7qkWGYD0/rWzWL9dYHbFbAw9lqo2m5IzCO6B2Ofbm4PNEnmcSDBN98fL13jc2xOU+WGKUeITfOY3YTpyrdYoT60EI5vpyicMLuhDcfykXXZem+/5U0bv5E/Y7u9Oe+RbNT6bkkhh5MMZmKqSWFe19sz59ySfr1jefrEGWPax1yBT7x+M1piKlV5E+E= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BTIuDUf3ivF8BEDiUrM5PdQhOU/1fQm0mrEIHnOqQvLv/9MUnadd6taZ1PFt6ew/Odi2536zJMcY3jWyVLTenptKjj3l55TErFRqRGFclA2VU73p+oAigxphvDM1s18mkHF2SIjZyr8yZ1+lpak13j7hf7yFZdkq30W7qkfo3kr0T1gBaRkIKy1PkvV1IPnic2vU+viHSpBhU0hCgDeAhpxvIFivA6nwe9D2WfvFHFFoA5fBp87PSx00FIBMSKkV2tugcVZcfXeZXebH8HjzjVqQ2dH8wxbCeRKtptoJTP0pC37Xdcb4/82Tfi2KMnjsWBTLKhOSmugNJVIDpY6M7BS8lxQJ5pVuvyA+If+9wTdC1aBTxXlBBX7BTT3nBcH1yu6HB5a9LZgVofPpL/dyFmRAfqXGXklGVmeSmoNaUScSLQXm9P1ucJXsoGWEa6GT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CBqbnW38opt5isJjSoJ9pMdNHTWUa05cyUJmqeaa5aii1B5R4TcPxsu2DxY1Z7j83NWvjpuzU0P6wURNaLERTAb4a967VWk/jgzvimRQwFQHERHLSPSDrh92Aw8u7jnsd5anqiBgetQZSs4oViaq1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76fbcf56-225d-418b-ecae-08d9770d9ea6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:23.1497 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 08/14] avfilter/vf_zscale: Use init instead of init_dict 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: eRLNXqenaR8w The AVDictionary was unused. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_zscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index dfea00f9eb..e2715eb8dc 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -128,7 +128,7 @@ typedef struct ZScaleContext { enum AVChromaLocation in_chromal, out_chromal; } ZScaleContext; -static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts) +static av_cold int init(AVFilterContext *ctx) { ZScaleContext *s = ctx->priv; int ret; @@ -927,7 +927,7 @@ static const AVFilterPad avfilter_vf_zscale_outputs[] = { const AVFilter ff_vf_zscale = { .name = "zscale", .description = NULL_IF_CONFIG_SMALL("Apply resizing, colorspace and bit depth conversion."), - .init_dict = init_dict, + .init = init, .query_formats = query_formats, .priv_size = sizeof(ZScaleContext), .priv_class = &zscale_class, From patchwork Mon Sep 13 23:23:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30224 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466904iov; Mon, 13 Sep 2021 16:25:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJbmviAte/klcFV8XeaYceEyUBK1fC5LIo3AmTXCKHDAgTG2rw0UDt8k/z1bh7qdIEG9NB X-Received: by 2002:a17:906:942:: with SMTP id j2mr5880567ejd.303.1631575509051; Mon, 13 Sep 2021 16:25:09 -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 ji22si9263912ejc.361.2021.09.13.16.25.08; Mon, 13 Sep 2021 16:25:09 -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=r0UWK8oD; 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 74B6D68AEEB; Tue, 14 Sep 2021 02:24:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071091.outbound.protection.outlook.com [40.92.71.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EED9268A903 for ; Tue, 14 Sep 2021 02:24:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XLEhJS3m95QI8WfZ4GtqkSmYY7vvEDXsCAL3lvLji+POzAQS0f+sCAW5LA9w22up6gyZRH4dkHfufBMJrShW9PUro/amMvSsGurjFXFskzpr7yWxQ3HTeklNKs5yvEmyGMthlyXIB7d3dM7Q7CUa6motGkXnLcmmaqZX/b3K3ylp4fAdOmyNFge5Bz1edwpeY817cIW02QJeNDNnEZftvxnmLXeGalWj68bmHQCYQCvNOBhHUcB0w5VcZ1futUwGEUUi94fRlf1rbKr7RO30zC7ccN+w9ZUfCzm9Daa273ohvt9FFMNqdzsv9PZqWAZpluQWYLi2GVvANIMHp7Echw== 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=ObQHVKHJJbcVfTEliOGI/NLoSQ9ZFsVzdKeX6Y40Npo=; b=BLQJsw1hWlTFQYRuI3iv0jPXRPp/JeVQXkihyj0gtMkioJzjNr9nuu0eqJV+tNPtL4RvqHEyc1g3hnMafVU8nvOGATHhGpS17wYrPpxogz114S/IHb9aIqT/yxzjOYu9CvH/dddKGRMtULvFTxqrxhYdBGYYXHgFkKmKujBAST2fjvWBEqCYCQB1Z4ZKwuEf4TZK3uz1ie5faZQqQhNOGo2Bz0DamT2POsoZaBBZR2+XgDXoUqso/56rWgG4IKwSTP292lDjx51sLcsiWD3w6pDDiY5xbBCkQSPJm7fZt/FlfgbtTX8hEgV4S+2/iM4XcNCi/tS1QAOEtdHoYCTRMg== 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=ObQHVKHJJbcVfTEliOGI/NLoSQ9ZFsVzdKeX6Y40Npo=; b=r0UWK8oDoC31klWxCpl+kco8Y9zyQnmOFtOdaqhbF96MASefxefm3cooai/AzjL2FQLCVm7j1vHvVqWBN3/ObcdxhjiDUF5tV/h1v20pN8EFR1mu4bmlerGsv5SEiiGyb72yC3xCE0LtoBfOzHljUT2PoPic0X1PtYRXJ5qHJhALgUfhjYsJXmdk/93lzdKjcIKiojuBNzURBJZj7dV3G/YaDdOpWu6uU6TOG31v/T0rjq6dzeiLv0Gk7TtuDR9+vODElpco0DtEJungcZrh8ru4ol0u3NPqLmIuIKPBCRf6MFNuFkpUWA4zQfrxC09679NvuopkXumzT9J8eh8ERQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:27 +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.019; Mon, 13 Sep 2021 23:24:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KTt/kTTdCGJqgjP9tZHDT8xKSnajwRbS] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8f287708-5736-4be0-2412-08d9770da120 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXSr2fKdz7sYt6AgME9bwCsXmVZ4i+SeRTGtYtAADX/FzF0O/q1sl3A6w/JJUylblf8ieF8V+7wzqDu0+0Kykaz98cdi9F4SDHbvIwtdW+tcakLEnFPIqLFvC6rsTcGr9DUhvANs3tKUE53MCGNJzlFbkasYzluhQwBDQYscBMcsrMXEC/4ZP0vTJf3mwtUeDRVkSuY2huZGnF1J/6x8+QhIyOBy11zqu7gPnvaFIwM+XpMsOn0+go5VFvr/Uds+K+S1T/dbTyqA+fWHlvWN+cqBERO60YxSMSZf+2rIDW64GBtAbzkESrLIGA16FL5kREpHxN9L3mU3QTquQcPxz50FJbGgHzvofRr9NEeHHmhIc45RhiYI3K4KguiRagQowhl8TixdG9tKnviGQWnVnV/zG5AsypxtUKeI6tSurkzYNvlETkhCaYuFZ7LsMeMmFv/TACk+l+qJd31HyfzBCF+e+xIFkscD0CnA30EVywG8p3xJQatgfAsjqcsRLx7sAJFCQ1TnjHZK5tu6HzbZB44/41THB9C/gG8+lJypbr8iAeo5JulJ7Ro9dLcIjP6nJm9ipL26RlKublWjo9XsRdmZDzRIH6/JP7J57hQjvuoDJC37xaltpOWYCCwQbQTPgEvi3Jyf7tWPJ5MZOvay6QlVWiKNU2pFE+/KMefwW5Xgze7UukCoZgS1TUdwJRltpsLS4gCCnfxG5BLpmVCg4mGmTzkCvAxB1s= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FDPxuPdNOTTjEEI55P/rQ3MkH/tAay2/nBnev4SnotK1Uo3fl2MktIsmwTI2/vk77piluXLuBOQiESHkuCm8bK4A56tV384JUA4G3KRSmsceUTbH5Cjltjqeezzd3f26GGzQ3UMKw+rb7YsfEYCiAWdiTYt1hRDltvQbKz72WJf0DjVgIEaVLP9ZfZsZlr4oIU7iwoZWaqNPOkjjMT2u6Gd7uvslubUTv839YAKfm0/gT4n+RhEBeiARWZ+yNeWfG4nwrERifhvSyqeTn5r6IfKs0ssfflwzE1Bb53Wmqjz3qz343TiwkSohlZcrdEr1JIuWFharwEcgur52w5ZOh9nCl6tPjf5VYo8IRzDLdH+gMhE9ECiy0M/AhTvLruv97s9IDt+JIRpvNYwe4a4sxQrUoTznfQdUEveyNOjTfEiWZTJ48+6NgS6ZgZuEHP1h X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pqlhSlkS2QIvdwn5EblVPMYOGJFY0jrZPROA+UNa+TWHuBBjRZ2ZIMmefLQGRS8et8pSYbTq0fioJ071jKz5BfnvC7h4kHrnJKzBkZlz1OhS3NgcgqTqpDyjUdupDRS9WOg1eoc4HQEOy20NuoZ04A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f287708-5736-4be0-2412-08d9770da120 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:27.3165 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 09/14] avfilter/vf_scale: Honour the AVFilter.init_dict documentation 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: 0Xbh9daTkz5w The documentation states that unrecognized options need to be returned (just as av_opt_set_dict() would do). Yet the scale and scale2ref filters didn't abide by this: They simply copied all options and in case it contained an unrecognized option was among them, they would error out later in config_props. This violates the documentation of av_filter_init_dict(). Fix this by only keeping the recognized options and returning the unrecognized ones. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_scale.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index a1902a13cf..c31b92b847 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -269,6 +269,8 @@ revert: static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts) { + const AVClass *class = sws_get_class(); + const AVDictionaryEntry *entry = NULL; ScaleContext *scale = ctx->priv; int ret; @@ -312,15 +314,23 @@ static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts) scale->flags = 0; if (scale->flags_str && *scale->flags_str) { - const AVClass *class = sws_get_class(); const AVOption *o = av_opt_find(&class, "sws_flags", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ); int ret = av_opt_eval_flags(&class, o, scale->flags_str, &scale->flags); if (ret < 0) return ret; } - scale->opts = *opts; - *opts = NULL; + FFSWAP(AVDictionary *, *opts, scale->opts); + /* Now move all the unrecognized options back to opts. */ + while (entry = av_dict_get(scale->opts, "", entry, AV_DICT_IGNORE_SUFFIX)) { + if (!av_opt_find(&class, entry->key, NULL, 0, AV_OPT_SEARCH_FAKE_OBJ)) { + if ((ret = av_dict_set(opts, entry->key, entry->value, 0)) < 0 || + (ret = av_dict_set(&scale->opts, entry->key, NULL, 0)) < 0) + return ret; + /* Removing the entry from scale->opts invalidated entry. */ + entry = NULL; + } + } return 0; } From patchwork Mon Sep 13 23:23:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30233 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4467010iov; Mon, 13 Sep 2021 16:25:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4A/BBIf59abt+xqocR9MyxI4xjXUXgHH0dC9Mh/6FhTejaJkLRqzqGOG3tS2PC9U0pUCt X-Received: by 2002:a05:6402:358c:: with SMTP id y12mr7543604edc.50.1631575518195; Mon, 13 Sep 2021 16:25:18 -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 c11si10747868edy.201.2021.09.13.16.25.17; Mon, 13 Sep 2021 16:25:18 -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=duVBARVm; 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 7480968AEF8; Tue, 14 Sep 2021 02:24:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071105.outbound.protection.outlook.com [40.92.71.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1266268A903 for ; Tue, 14 Sep 2021 02:24:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GTaG/LOaviPUlg+cgm2rloS0gSoCjajgruVQM3dsz2a1ysGPaV99KvXvoVXPwC/WDM6xSKR933miuL5nIkF1dopRBGHomPjbnDIt2X8zavvhZtAEjXzvknUqKW63XN6h7otc1q7K/MB7WJ00EOIv1mJCa5km2aQvu6HoZ3sFEcxHwXtfgiGPA2FDXh8z88A4p/DThxd6VjIhS+RqCtrdkQ3F2Zvk+jfvSpjGjWw7UkHu+49xtSnvytXbf6eKRbbuaMzKaFW2zflKOBXXuE9nO90UsGQ+LnpAnhtd5v1E0lNDIc3mFQaTaZ5z8yVlsyr59NJP8DVCnFwWnUYTM2icyQ== 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=8QYJ+roRQYuKPeEyUyL28v/OvM7CKq87cWb0/bjNbSk=; b=I36ad5tQd86L43KE1Z9BfCy8Wb7IfTyzsll2N+7tpg7pIH8/yp/jWyWYy+bkfpR7g9Q+LEX4WuKV6/6QHl4QLfIKFbF5QnHSGGg82WKiLhbF2Mk4GLxhrKAziH9CMDMign25v5V1qRlogXEAcgER9wwewaUX6PALJMzdHYpqUwhotAPM40u1C3+xSfDimtHgZ+kcl2wdvbU+4zmkeSwVMxd5lfqXV0gTtqsQauVLnE/iPJ3WuMh39+gt8VAuSME8jwaldBwIqaD7JUrMGIJxtVAMFu9q65we0Ztn4euKb65+UUw+I5UVjRk3xOYXKBsG/TK+bKehzCkdQHD97YGJgQ== 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=8QYJ+roRQYuKPeEyUyL28v/OvM7CKq87cWb0/bjNbSk=; b=duVBARVmQknsEzUKF1o9cbot3Q6M5l6feNw0aQ2LFh8Uci05jTjFSQYMK88EhStkcLmGAeU4Tt62bcs5y+dBJTnCNaznLZXBDIEVlOH69D9eblAUuXMjYuCib2kH+X6/4SAeFZ7rypz6BdrCTvfvBA8Rweg9aA4WCfhQN8yDNvujW2TZdAyF7hPLYsQeBFxnw0FL/b4/lOnmzq6FF1fLemTzRihZc1c4mMLge89DjEz5aePGnydPsG7dS4i2Hsy/v/uscdzqOye00ilIes3rELL7CS/JLsRgs2JqbEC7bluXXCuGoXeQBaoUjPJxVzDqkcM8DagZQNAVx8CaFsIquQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:30 +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.019; Mon, 13 Sep 2021 23:24:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [0LLM3aT66M2z5+Fhqypbu9JqLcUS0LYM] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fcdc276f-26e6-4683-ca2f-08d9770da309 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ0H+K4Wek5UQBrLJju5Y35rJiF2NrBa7nan5oBSNPQLTL7Ei5lVdL9YJH4cmVDPYfldDO44pplfWKJvUUnoR8i9mo2hlMtJ5wghlUuM/QjzfyTYKn3lTs58ZZOWohkloMQ7Hzedk35HFniLLD8yUprO1cAoq6ldefToAvRm7IPxJOVssqokzLatTlKdiZ4AM9ki2+WM2Al9UnN8694RHYnuY7FBhsuVuhgTuMUiLW29mjX/elDfqqKNsenxuoudPlFy2NIVzLac03G+fB6x7t9bmtnn6fjYNfMKHzBLp257F2Xsj8+KGrpFJwn10orMy+ttQ3ug7ah0fBKDsVD1JoqDMgS/e+hZK/fqI9Kf3u3YRRXCydSPMSMGnerERXyWOguLGKqVLQBK9F1CENeKXPGItiEHLtn2Kiv95wlizMMEwv9imETELliT1/EoiqLQ5FSV5ieAUSNyEi63itRLK/wKvX7x2mnE8mTy7FLGTWHEnkeAc/vBGpVmG8F+euBbZLFLbb1lpA5d+yxQDuZeJe8pRFwXBfeqLBnGxXLKJf0INS1QtRrohLvineFdT2qxXUgvCBi5jhpaBky7gmafqWLofjP5ozZqzimfF6j2TWO5QwHG6AhhbrycFY2G51irgZ9Tdso+eTwMR8GbyCKdHUrtlN0AgYDG+2oA98lFMRqFE0uUC/bo0hqmZ2bOCZ4bLOZCw4iyal3FA== X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mGaf0s5Mbp9KrVgah/qaIJGMTj14RCxSrf9w7dNY+TqbkAmuXcXk8W7qtVuKss4+ilPG9Fh7vIksWIc1HqkCwIzmqPR0NzCLp2mNGdyU520qpFr9sF/hUxabyR5U8KS1RlwJ1OpcMSjbktR2G8GiSRlktH5D1TQrFTvm3t/SI3J8as7IxM4yCGPU/ocFQFbx9EtO7K+zzx+/hSk/9aqom7iQfTLYEDge47e1PRAv4qTkfwGDtgt7QRFzt0evw1uR3PNqvlhEI3lZFfBrMnWS0fePesP1+xVJTQQwyyG8ZHUcN2nJxounfnGuZ6C2pwzS2J2RpYjONnRh9igumB/vnmarTftL5aQKH2nJZXNBoO3aDXe5S21jsz+IhVO8+ckUQ2Zo4vjZk8fkjXWiqsaUzLc/aWgb//PclTTwjsjy4UnHgzTmTCtl9GNh63yAwjfX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ndBMy297JOnzkSUEl20W92LV8sS7qSvl+j6bii0aDFOgRNeGCyr1fRL7ThfU3khEDzJsHUJp1mxJh2dPPvUjeEzoWwAJ7Phe48Q/3+E77/b3dUJ1Wy0YH1yaYnozEFb1yG2S4qEcndBI3Pfn6hkiiw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fcdc276f-26e6-4683-ca2f-08d9770da309 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:30.5374 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 10/14] avfilter/avfilter: Remove redundant parsing code 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: kCXlEUDboBjj avfilter_init_str() (via process_options()) both applies options extracted from the given string directly to the relevant (private) context as well as to an AVDictionary that is later given to avfilter_init_dict() which applies these options again. This is unnecessary, so leave applying the options to avfilter_init_dict(); this also has the advantage that it will be possible to report all unrecognized options before erroring out in case of unrecognized options, whereas the current code automatically stops after the first such option. Signed-off-by: Andreas Rheinhardt --- The reason I am resending this is that most filters using init_dict ignored its requirements; without the preceding patches fixing them the scaling filters init function would succeed, but one would get an error message lateron in case of unrecognized options. libavfilter/avfilter.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c614eb0740..11d4e01807 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -853,25 +853,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value); - if (av_opt_find(ctx, key, NULL, 0, 0)) { - ret = av_opt_set(ctx, key, value, 0); - if (ret < 0) { - av_free(value); - av_free(parsed_key); - return ret; - } - } else { av_dict_set(options, key, value, 0); - if ((ret = av_opt_set(ctx->priv, key, value, AV_OPT_SEARCH_CHILDREN)) < 0) { - if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { - if (ret == AVERROR_OPTION_NOT_FOUND) - av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); - av_free(value); - av_free(parsed_key); - return ret; - } - } - } av_free(value); av_free(parsed_key); From patchwork Mon Sep 13 23:23:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4467109iov; Mon, 13 Sep 2021 16:25:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRfVBlt6L3CeSMj2V2Jp8zDUR6VPj8XE6OW1r3R9nVNNW0Pfa17c7W7BXjejsu+hfDEblC X-Received: by 2002:a17:907:1de0:: with SMTP id og32mr15411557ejc.348.1631575526992; Mon, 13 Sep 2021 16:25:26 -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 eg14si9711667edb.507.2021.09.13.16.25.26; Mon, 13 Sep 2021 16:25:26 -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=Xxjh3b8w; 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 54F7768AEF9; Tue, 14 Sep 2021 02:24:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071040.outbound.protection.outlook.com [40.92.71.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EA1068AEF0 for ; Tue, 14 Sep 2021 02:24:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MfO6IBMnZRX5V26zubdTnm4EX/1GTolnr0QlNbtuijCmWL548f4deCdNEkMopqVKHkpwkwy/fQoNvbG6p83Y3bNHDDT3yupKUG6JB3+bkLh6XAsXdPII4ZDE6PgsIhnciOOa8S6HfJDQz5gngd6JQUuJaSsjTtDQVWm8rilQxhH2KFB5Mma9pYM1ltV9XXi1kEnxTD36diiAp8Q3Qvjdx9r9n1+vatBhgodJ5muGIhkyoy/lBxYax7ZQxDPwDugkR/bE/4krLPl0y2Z0T7wBKoamxUdG6PWqC8SBdFCCgQ7ZoEVdpEJDRH3MT2M0+5R+QHx+bDCM5sTJzE3zso28Jg== 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=VSPZBMg7jFiq69Dk0P5K7SRuv9aNWvfthMadoXGlcPU=; b=n3qOQ1bcIDV0mLs+vOcBYPNPefzGyE0ToHXgs9JnaH6tvqtu8mwF4kaUUX8x1ZEIE2MKhuF1is79yY2Pj0u9Hwyz1HgYdWQ3jj86DXKh50ec98BE5UjkEgpjgIPdR8XJ6qSfUAFvpi0juxEARAiORMHTwgd7QtXJdlXsRfmqGx9oM0NTU1G6CVjfHqr0CDjWNT+aCqSgEyuAxCQXq1UUrPA6fHkLdX1TW7nFD1SlJlMXLn+2ZRiQ9ZmxBPEQ61x35nWl14S5d6OjVZ53FOHSLXkes2Ph55PLZFH2OWasA8JJubs0LuD2gmEZpvLCkpE7WpxG+v12qO8nwhPAJa9M8g== 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=VSPZBMg7jFiq69Dk0P5K7SRuv9aNWvfthMadoXGlcPU=; b=Xxjh3b8wMCLSL7D9UK8NjEqZ9ZLJoL8k7rlKK5sB8nU2iAQEiWnRqwaJmqTdKbhcLdJOM4OHJnkmHxXDHHzu9q0C+eov26HuW5QbL5Y7IPzfrZ6FIBMxlwL/Ytv/E4tT9gyNrIqdScW1o7SgXVMv2C98TCfrAbl5o6p+UJZ/KfBaxhNiECEkeQM5rrH6kXEHXJGzRNtbooeusLXFs+4MQw/cVgpTo2W5r5f103gVuqd0ooeOFpOJgKTMC9eRIdl1Ue+oljPIzPONvIdEBJ3dzQCVgf3pDkaJFWeYuaqJTOoYqU/UuIeB2GAEeDzVjnTSMdK+oazZ9eSe4xsYN1StUg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:33 +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.019; Mon, 13 Sep 2021 23:24:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [x+n7+00tCpOXV5QpEldgttQe2fAKDuPd] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 50ccc1f5-7f2b-4b5b-f829-08d9770da4ed X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXSr2fKdz7sYt6AgME9bwCsuPOVNupuaQBDVwb4tOdJyBAAj44Ra/edVF2bNXegt9ZHp1UUKhtOMIVtKXlVXHQsEHW7p3hWNvV+kbK8aHFqrtR/HiRW5jF6luMKlDALluW3PRw5w6LgpJH7Ci9pgGhiPwoqbYUb+rJLEhKP0+Pr1qd45EugQdjrvXJ5MsHL3Wa8rh/NA+s+OQJJFGMSwd4WQwohcs6dwaKHvT3pOPtZyRd+ISoRd6yT7ycU0OOzXnSOPiIxOuBDO4MwIT10QkbphfN/tUtYRRFaUWZfbrDtW+ub26Laf29rUJ7E+Wrh0soCYvAGBxzXiwtmBrdg7978heEyA/BQIcPPskNXGAWmJS/rsPDJcu4jK2bCEGqhL2RDl3FbLbmls98zulQMQZypI8fERga+QfRYygPfGakkQu7OAC8SNtEhl0iqz0CNTYnTQfswhMGzFwNYplNRQUaokYD5//jRChJuS0hrTW/jVO4HXu4ArmEhzgy9iaj19b3rqm/dB8nVNkaU7PxIYe9jM+Ek+6KwIJvBXZs1uAerqumENMviFoW1qqIs83zvue22WFYjPGwTyfw1wm+yyXnj8cFDD++IRJFXL/rTQxrnDT/M+oFWu8Jdt9lRiAHqIAsZ7JJk+Ur4XLkvbPip0/Rqh26oKIv+olrXvGuJ5uJov+c0dLKHJjHBkYP5A3w3Cmkskg0SyQnpuh8Q5ml0I9Omdi/gVTzQhjc= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g6LZw+7ZrAAo/WPgtZmak35pliTnYrsgm6gCHd2TWvEclNKZqRwLsdgOgBtpumDY0HhQvjTxQjqufv85VKME8hu3fs8bId9/s/3i8b1rEiTD4zGAaiom9Fy7K/gaeoaacXfg4hb3iU4fc3K5G0+OkJ3cMWkFCPg4SA11VVespobWWrPt5hzXcardu8Cw1KynOped3Ms4mkU25hGP3eQvhPqWkYiCdch8aJRC8pmgbHD9uymWLb28DVp2WdIGTrxZRHAt8iiMD1RBS/faNUJaxrELb+825cRxc6QdPYjXFGXF8uPI/F1/FMQ0VxpgXQWSalCLlb0VfoRNreCGpE0EVKp7kEvr59bgW9i8uX7l5cKZ8h1xsnLEuiReCHSTKxiflhgwjDNVwSwoRy1XCe/O9bUeFLgmFH8PbQT3BzKD3E91Cu98xentLQCgk30e/QA0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a4shL2WtcRcqpXoPG8x1yc4LebnAET89Mn6k59RSl4cfOZOHG94hVGtLOE3A4xl6riaBRJ6ZAp3YPrG4NZ0iywLRmIKxR/o7IwuIXYAsFrL0zVn4a9JjmA1kOCyWHDKMoN6+oeCTeplS/DaMOWNnEQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50ccc1f5-7f2b-4b5b-f829-08d9770da4ed X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:33.6956 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 11/14] avfilter/avfilter: Use AV_DICT_DONT_STRDUP_(KEY|VAL) when possible 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: jvca0FCxoO3f Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 11d4e01807..cc499fd5ed 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -822,6 +822,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, while (*args) { const char *shorthand = NULL; + int flags = AV_DICT_DONT_STRDUP_VAL; o = av_opt_next(ctx->priv, o); if (o) { @@ -846,6 +847,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, args++; if (parsed_key) { key = parsed_key; + flags |= AV_DICT_DONT_STRDUP_KEY; while ((o = av_opt_next(ctx->priv, o))); /* discard all remaining shorthand */ } else { key = shorthand; @@ -853,10 +855,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value); - av_dict_set(options, key, value, 0); - - av_free(value); - av_free(parsed_key); + av_dict_set(options, key, value, flags); } return 0; From patchwork Mon Sep 13 23:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4467229iov; Mon, 13 Sep 2021 16:25:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCBUvNEZZq/YzTNTnpLGAqF5xakXSl3y0ESnyKwohE9H5wWDgJNitNJqrytNb8K07kBWCi X-Received: by 2002:a17:906:50d:: with SMTP id j13mr9078963eja.58.1631575537261; Mon, 13 Sep 2021 16:25:37 -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 v21si10306983ejg.618.2021.09.13.16.25.36; Mon, 13 Sep 2021 16:25:37 -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=i+f23iEn; 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 56AF768AF12; Tue, 14 Sep 2021 02:24:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071100.outbound.protection.outlook.com [40.92.71.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 781C268AF04 for ; Tue, 14 Sep 2021 02:24:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jD/Q8bn/OInHQnRwxW1mq8n7hELQYkXLbU+pxlV8u8FdNSobw5Awte3uglBKqOW2on2fXCWsjsEx2ptUBwjJU0I0QC41IITGGjz/whSuXZGL22GGoDTkE5b095zsVJp7lZoxBvrL6rBcuYXaXd5Lrn6L1s9rHj3G7Lf/mBAjhwqmNlEen7AypfSx2f3mN2xWsc0fPmUT+47giCwrwFoGQF/Van3cFWnnWv/h1iW5UU32D4eSkRa/+oWufJpYWXQBbR+j+jzT3RrVfPL7KhIB2f7Ynwad3OuVx+bTy9jSt9oSJuSr0jE/mg718W9huKOtCDUTYPLj5CV4UJtQHkR6IA== 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=e5Xtvc2RaJ/Lv6sAsO17SRijiLsHhYa6XMgtQgD1Cn4=; b=ROWZpHPqlTTo4T3rC3elSR6lMeYsserYhVtGkh9IUUAjM1rbtrOAbvhrXDvazJtj9SY1BFe0KoZJlmtDjZ1hXM/5M1Jam4C8348u584qnNOXbdxu+eZ+Pm/RPrVIJHjNvipZc9eSEeLqDpDBeIp2kW4KZfczZt9GLrnGUxiCa8jUkhaLvM5LaJg7ZuYFlB6Lzt2FtSyu9pNzrh0lnRZTwIO9rjiqComXr2YCuZfQSwF6K3wadem4qiMgYUfcgpdBI0poKwanbhvtJLDfvQNiOL1GAKlYdgnLHMDOlpo7E9NMbnQWKXLTn7AcZ3MvL/RAXm3ga9HSkh06oXitLgDyJg== 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=e5Xtvc2RaJ/Lv6sAsO17SRijiLsHhYa6XMgtQgD1Cn4=; b=i+f23iEncxkMRnwmlW2G6zWz5ydHCyecbUemErsLJ0NRNkvBxlIdXoDAeBGkFWwxk9+cJELsxW+AKJWtOoFfURIhqyQyNA9DcomGzfNtY09KpBZDcngJf5dCQIdhS+MpQ58nhzlXA0KVYpmljiyidhQcwfYKBrEwXO+MbZrQ2FzQThZnysnb7s/6lXrKwzdAUToAk/10ekEN21z+oYYvvgBCdJHhl1EMawK/udGITym9Hv1ZqC0QX3SG+xjSA5iI9h31ibVqNxxMEamT9VJrmLOXCkxsWcLc9D5OUQQIPgZy7C006y/+Okh/nL1JTWQw/Z51/fgZvVcIpTKJWn1VQg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:36 +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.019; Mon, 13 Sep 2021 23:24:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [f5zaZU22/Xx/PYNuePu31cVwuSMgs1xE] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c599e61-c3a8-4711-0b89-08d9770da6c2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ0H+K4Wek5UQBrLJju5Y35sI7iP0HE2DAtPVj5HBai6VDFrJ8OTXFxl1KDI+DpvjN5NKO9p/9OkRFVqvXDNAdSubPMEy7XhCBudS1ho7hwiae0087f1S2bHZZgRGzLORQ3dqx3CmMDFmdVDKVeJ/MbonEx1T1Ytgc2cm5/GgPnuzV50LfBdDWilNsRFsQ1vAG95tm/CtGvYNbPeTJXNhmDFG/7xUMaoHmVxDTRSnm5LSVtxOtBql+mI/vgFRY0v5W6gcuwUx78gwDtChZOB5gCzqfRED+nCx6Li7D5Ta6gehgI4rXdWgqX4/iVeuwrBkcm8T2uO1buWMvd85YSX61AexJJOfI4vGa5YaHTdWWooAlcE5uPFMJetvRPsTlpwYMZQj3QMWEM2VvS4ZTXN5rG0nkkaDkEGe962Shc3SDEmva96Xbvrr+WJhXY1aQCIpxo9AherLgSGoV92bxYAsDecmZ09k7LHLC4RDrOa4RfaLt64CH7hBtx4pYUoqad27AjwrcQNpbS8/2zwjrNImUgnmQAg4YkobL0cTuW98FWYRJK7Tf4MScLffBATCx6pPu3kydv9IJQA4fcMY1ri2lsvWsRHl1zWi3oarYXIeRpW50KtOrLdVJuot8AkO2bwfto36q6F7aAzQmVZl1DCaqyD/hpav20Ijy/FOl6ccOun004+OLKK59CaxgRG5US3d3790cnH/gXbA== X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AA8NDXK4Ujxsa4RiJc1eVns6QEqGs5R7Q0cEIC0gFRLhD70nyhpTliWtdGYwHXnCT6afO3hmrr/jWKNlLd4sFCKHwZbj2XYs9GFvMI7mDSD9CGZRQ3eiOHaGOor71dwFzB5JCBKlnDjNI6Jk1WEvj0sun83npPtOgfUmloArlU3om3mmF/MG7SwWcdTgEE9PF4fwyWwLZdL7uSXr9U+4dBYee3cOe0AfRsARLirQP+25yzGhlzFrrRbQeLYes4VHhHo8LCxZHmDR8yjhXufO83jhGw7CBErAYRKO26Fw+1KlhKksvEPMNxliiX08REK6UccH177nFaWVadIbgablVlX8wqRSLzQ/r3X6Azf8dn9vQ/gYQGjpYS4OO+vYxFbBzCAHcq21t/st6MHtCG0Tw17BJuZib2KIYx5g4B/GPDEFrs0/DBt824lcqqhT/Q0G X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8no1ITHee3CXL5sciFi7ISDc2L2lbzkNaEXaR2nsvqQ7DfentVSUrYE5x6dTqxLIhyv6vzppDc0UQOl0EkMU4CEHZc0MQYrHpPy2qg7qVt1Cc6hfd36kt+1917WAkvVropwhLyOm7KCFekuGAODNNA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c599e61-c3a8-4711-0b89-08d9770da6c2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:36.7522 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 12/14] avfilter/avfilter: Honour the short options documentation 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: 8EBPDFt4qD0M The documentation for filter arguments states that short options must precede long options (i.e. those of the form key=value). Yet if process_options() encounters arguments not abiding by this, it simply treats short options after a long option as if it were parsing short options for the first time. In particular, it overwrites options already set earlier, possibly via other short options. This is not how it is intended (as a comment in the code indicates). This commit modifies the code to reject further shorthand options after a long option has been encountered. After all, avfilter_init_str() errors out upon unrecognized options, so it is intended to be picky. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index cc499fd5ed..165ab1f44a 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -814,6 +814,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, const AVOption *o = NULL; int ret; char *av_uninit(parsed_key), *av_uninit(value); + const AVClass *priv = ctx->filter->priv_class; const char *key; int offset= -1; @@ -824,8 +825,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, const char *shorthand = NULL; int flags = AV_DICT_DONT_STRDUP_VAL; - o = av_opt_next(ctx->priv, o); - if (o) { + if (priv && (o = av_opt_next(ctx->priv, o))) { if (o->type == AV_OPT_TYPE_CONST || o->offset == offset) continue; offset = o->offset; @@ -848,7 +848,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, if (parsed_key) { key = parsed_key; flags |= AV_DICT_DONT_STRDUP_KEY; - while ((o = av_opt_next(ctx->priv, o))); /* discard all remaining shorthand */ + priv = NULL; /* reject all remaining shorthand */ } else { key = shorthand; } From patchwork Mon Sep 13 23:23:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30235 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4467357iov; Mon, 13 Sep 2021 16:25:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5F6ExWHJD12zgd6K6FgOHmvDmQSZ/7RYVFvdZfShMdDH+dSFlvgol6PvBW7HiqF7rDBO4 X-Received: by 2002:a05:6402:5:: with SMTP id d5mr15957632edu.359.1631575547367; Mon, 13 Sep 2021 16:25:47 -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 bm16si4246633edb.317.2021.09.13.16.25.47; Mon, 13 Sep 2021 16:25:47 -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=iy4l5GpF; 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 50A2C68AF1C; Tue, 14 Sep 2021 02:24:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071089.outbound.protection.outlook.com [40.92.71.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BC6168AEFF for ; Tue, 14 Sep 2021 02:24:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ns6BK6r1eJ1BzaQVaYh8U0LKUjZZppwsqsDqqjnPlhzenzqMEn+rFp08V7zbfwh8BcIdt2aFuTdWl3xObUfL99ai9ChlgJeWnTvmp7FU+JpEofka6t3oaxvcYIYx+GJtaVS+jGJKJsJu/bU5gbnpdCicuK6WYZb3bq8NDxHbtnFx6XRNMCt7t9te0hcdOLH12tUsRfOomw6lb0wbazsuhFbvMd+bqqe8f/0rS3dJywkSjwf2Y/YaCSFSw2Ebtv+2cWeJfiHNakXEVlauAaGZgfOOZs2O6F5VEMCKW0OrTL5gkZPpwYi0KDIxw0tL0lXG2ROCmbSBNVX8e8PqERTyUg== 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=Wz60DlJ/5npm3t1PRCOF3nmngegG7yakdcEtJcsNdNc=; b=AmzOSTa8etBG0nxNotDzgGvQFlVJ0O1hlGO0KazBT2p51zppNkskN/yIYFAPmr11KwFTFkxfHT6afu5ixgGpuifPgpZzqXp+CKiwYYMlGtX3tbKZ7kwQYQbkMdOo7jrYz/k3RvlIrPRfAsrRzQfAv7vgVeFXo+OshvX7tp6o27xD2Gj7DnnH8uZCGp/ac0VDzves7rFDMcGH23K8+0a2CI5ZWaTZgP/9IeeyTthgI2WqCTX2bHTpDvOs81KzTyWU1VX6mDKvLBqZyiZEeOeKaC3SdKk5AXDkJ8Eqnf69RkW/NCIyKM+icwbZe2DCzzt/FG8sMqlcoVsAR+MA3ZyMPA== 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=Wz60DlJ/5npm3t1PRCOF3nmngegG7yakdcEtJcsNdNc=; b=iy4l5GpFbHHstF8T7niTe3/IecOEDrOc3YQJxZWr1dO0DscazAAaN7UaPZbjLOhCX4eer0gzxLpm0ugNPKGvF+6qljK9p2iycvBxapYxLB7CQ9PpO5C4xANbZ75lO2/jSKve5IY1fpLJS3QOF9Gp0P8ra0g7VU/vXM9fP6zsN51u4q5DA7Ihv1KLu9GSurw/rc79SY98dSIR9aR0alJspS+LjlX+YKdLIi7YM+2xRQ1UjtGckVWMOS1P5eoeXlIlI4a9Dr73+Qsz0Q71gkjIej5+TX570B4Q77EPFZTsq+wdLWc/N9A45+ckEUdsl3FOR+8vTpRACohRoHOM+pvpTg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:39 +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.019; Mon, 13 Sep 2021 23:24:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [0oTZ2lobjf6bVOsvfuIp/IO4UCHX51Hp] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 029ea761-393e-4dda-5619-08d9770da897 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSwGI4buAwfZe0futHLJHOz2hSX1kfQucMpsP1qP52xGAYI41QZ+We9XsLcxtj4WtmVDnT6rdLoDKwhCXjLDbEgI4CEtEtA3wpRcJLAfRJbEyTOHYW/lsogctFsZ0nP5IX55oWoHDjDjw7/u92a0HeMWlbNJCeNlcrKy/+9vhJiDVIIiJVzmUwMtem0QguBifA930HSRU242bixIR4mcFpLN03zByVqw/OKuBVoOU49c/W3/7ZUEm7JaTAuM9wCPq6btq9TW5be+GTomuLL5SWTGcKMLZulJd2urMuAD7IrpSBpAUlcG4EwsziETEhKGzSeysAZOKwVG8at4JIkpuGKtDvpg7W01BX2wmuP3+AbDPydUkWziKHjkcJ1Hwi8EzC28iNTmE6c8IzO03/AheOBkuUZnKCJObweILQurPyMIaZV+hWGM73rYiXuV/omEQL8j6cP3x3YLYj0D4U8ks0uV/0jxcxnmCpHgzGYTwhe6qoIAUHZV18w9HmRlar0ROAGM1DgWpk8Cba0CS+C0DBljQKmI6asqKTqJULW0kAPRsL0sgeCXd4X4xIXT/yy2fnQZieHrUWAjJIgSrieu+L4vXSNjoWKIuUdslpbYKxGPclMIf8oxBFjPisBHC6HR8110gOYPZBF97uiLV0NHxA3nrDpYrpuSN+6jkh+RTXBb1ndwNh7QRFgOTwjhRYU1Ug3LfyC5eEMsvPrRi6VFEY/77DGdCY1fczaNQ9dXfx4PlASfRkG+REc1XpSnZpdrCo= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DyPReMT2YxXgWbsjeA8u40T7BPsRigj7HN+vkO83uVj78hC1TZAGhN4/9OFMrR1sGjTfCPbRI6NKZbI9VJMTK3qVw4vfxXRjZtXfHhVMaUgsJdeBOlyAvq1577MwFkvkTf315v67vW8Ld8AwGDw/QRxrMJw0fBXcW7GFN9mTCxtOg2eJ92z7/uKFWc+Eg762GDz/Eq6NeCQ1Jtdvx+JZVaDGjQ4eqTLqbuig79vgrEXCHWro6auYcu63Qtd/uq+jY9WgKIcYCW4jV5BfxKJKMRb2Y8mWecNzwDi2OAqqLIEyYDZ1wXNxK9SnNQXlBNgvEE7iebzYvhUQwgrfwa4UmEbhnQu6+/UNXEm7+GkLb/5P8dzt08WbDS1gYtfDz0oJN4h/4hzo6vvw0sYw49aTWt3SER6vuURIJif/8/DSph2UZ6ZEYSKucauurYBfIEB4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1aO+8gWFtBGchsNS2BOkPAaayfI5LgGBE8YMbSQ69C5bQXqwQwbyc7qYQD/gyXufXOLDI0m3WzqOoRC2caEVCsGy+7yRUVtpXfHQMRErse1WydmEZMjBkienfAFt4MrxMc3k7LOjgcjSW69RAIt5PQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 029ea761-393e-4dda-5619-08d9770da897 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:39.8258 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 13/14] avfilter/avfilter: Don't fail upon options for filter without 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: 7NLxCA2meAeq Commit 62549f9655c48f0ec061087fa33a96040ce01145 added a check to (the predecessor of) avfilter_init_str() to error out if options were provided to a filter without options (or rather, without private class). This was fine at the time, yet soon afterwards commit fdd93eabfb2644f541f7aac9943abce26776ea73 added a generic option for all AVFilterContexts and since then it is wrong to error out in case options have been provided to a filter without AVClass. To workaround this issue, several filters with timeline support added AVClasses and empty options; these will be removed in subsequent commits. Furthermore, the super2xsai filter supports slice threading, but no options and so has no AVClass, making it impossible to set the number of threads when using avfilter_init_str() (and therefore from the ffmpeg-tool). This is fixed by this commit, too. Signed-off-by: Andreas Rheinhardt --- Now with a comment explaining the two functions of checking for priv. libavfilter/avfilter.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 165ab1f44a..4971ad9d9f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -825,6 +825,9 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, const char *shorthand = NULL; int flags = AV_DICT_DONT_STRDUP_VAL; + /* Besides ensuring that shorthand options after long options + * are rejected checking for priv also ensures that we don't call + * av_opt_next when ctx->priv is not AVOpt-enabled. */ if (priv && (o = av_opt_next(ctx->priv, o))) { if (o->type == AV_OPT_TYPE_CONST || o->offset == offset) continue; @@ -922,12 +925,6 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) int ret = 0; if (args && *args) { - if (!filter->filter->priv_class) { - av_log(filter, AV_LOG_ERROR, "This filter does not take any " - "options, but options were provided: %s.\n", args); - return AVERROR(EINVAL); - } - ret = process_options(filter, &options, args); if (ret < 0) goto fail; From patchwork Mon Sep 13 23:23:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30230 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4467463iov; Mon, 13 Sep 2021 16:25:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwy1/+cx7I11gNUWHfku0rnM2o5npUdSutP1EjnuIyySYvB3xiSbyN3pqWtm2UXvA8VhGbI X-Received: by 2002:a17:907:9602:: with SMTP id gb2mr15717784ejc.119.1631575557524; Mon, 13 Sep 2021 16:25:57 -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 1si8875143edv.359.2021.09.13.16.25.57; Mon, 13 Sep 2021 16:25:57 -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=BZ18KkiZ; 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 3ED0B68AF26; Tue, 14 Sep 2021 02:24:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071064.outbound.protection.outlook.com [40.92.71.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D1AA68AABE for ; Tue, 14 Sep 2021 02:24:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yt5VkH5RBiAYcI4ptqIQlWeB+rqEwcHM54DHsdpHVpB9rgbZLCnD1++Gjas0A6HwuH6mU+lKG5I9apsoTr4IQhf6VYJ323pT0CuaO5946XUosJakzzpJKYptc8xPZg8I9YQeYxHNYSD1Zu2263gkAQ9sZi5+bIXBppnznGGdmbl4mgSdUwvRphvHqjbligGzdLgr35w27Pe6L5zgX4tC4lc7XzE5Mp+tTfEaZOemWbWGxVWwGz8Wug5vQdBl8cwG3dYNQFwOzsAs6LEjDYXbMojzAFBDgDuxN7uIgspT7X4lhiNfaIun3GspkdKnyBawcs4spIbO4lYEakB67Rz5qQ== 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=Jji4Luo2MYm7INhwPk3KZm9vp5iU34HlGKTtnEn5G+M=; b=KVmPDjz1njYXfF8lUDxGjqhuc1buiNc3WyAmG1XuFU9RYNtIS+vUCtOsw+seY3FCL2gLq0Z/XaUyZsd2cCXp0wodyRouC5VDlVlAbq3wrHCbHonFgieRlGruKrjry3/DCPlGTxKBksYOcWmerp3Eu2IRmtCj2bSbkLGq+zLs+BiGfqVxm2t+Cb6XgZ8FYGd0DX4tFIUVSpryltgKFEd+zPzPXKPfV5sfIKuQmLVFvIiRsquN9PgGkSqqzlqPZvCI+KCH32b9JEQAC9019JzlYq27ya9bQzy9kIgR8IQEN2Fl+tqRsSfxQpR3PGGGLbBo4J0Z4+5xdABFcd/V9en9Ww== 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=Jji4Luo2MYm7INhwPk3KZm9vp5iU34HlGKTtnEn5G+M=; b=BZ18KkiZWqUDkzFbrcIszz4iT9QptHJDhNFxTm/wAJypJf4oergwBT7Bzv9I7lSw7+Ejis7yns4IgSrorjv98AWZtv4bWtG8n+r4N2Br9R55YtaqepDXkVKh5c8jhCfw4kykEmzqPHEmH+JcbiocJk1S/n0tOsdYi1HEXJS/wdREgNj3u/p/HCSA3ceOfeQC4BDxeUVsyDMbDIpOBD33CcRG3Jz/EREBZvg7bI90zQn/ewf21wYwwqOxFEeO/fbfimmVubFyAuq8cXzKKrtTrxMIWDAmJZwLAg0mZxDcUnsoxZIDq8V0mxbIohP33GytZoACN6vMbtKKfspRfVeLUA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:43 +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.019; Mon, 13 Sep 2021 23:24:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [W1TmxH09IcB99kPFflkUgmuK5YR0t95V] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 152b16dc-fde3-454e-db3b-08d9770daa72 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXSr2fKdz7sYt6AgME9bwCsH05U6uHKov+GOibm+pudLNiKoD2yw1wQ/XdDHvuEbLSk2Em/x+qW7DhGU8UIZzYe73VFgjteT1iq79bRwf/qSvzN3q8jCQncHhQWFKOAll0pWy3asZ7ZfcERBiKQ1Gn3zbSY9VF3MkUSxp/yOeMfgrRiMf/SYjoCMRVax6vqIIzD6aP7ybadQVHwqxxWbOmGpoOGDQgp27MyJEU+Yf4cgqTf9ZH60TRE6UCsmrcUzcpqsCd9dYuI0YsbNpICWCcc/3L7tndliVg90kS4cW9uYnneJQgWQeoCb8LUsn9XIsHg0qfHEtkQhVIcmKvxglZo3qsaLFly90+KDeRKKCbbNb4f+hrsc6+Iy7OyoqXjwp4DZ0tn5q+jw/azukyRv0kFlckuQD2C0V08HbVBKiCmjJDJs9AzF5sLp5vYOjkCLj7opVmMoFSV/R4ZOik1VtHc4MWcLonqSoa6+VjBI4+0S6jPLKWoqXicUGyEzt+f+6e7MvC8f/zVX8KYgICke7UzpRluJHl+tzadnnjoFoG8kjjUmIY2YlhV/ajMO3L+fCQ4HULrPtPssidM0itwS/zYBFwbxTx7XJQEznr3fyXkEEFXS847y2yXU69CCMdlhTRAK+dF0rIA08dSGXmgpeC6jTdbsn0YG9g9P0Pe55AWhw9hd9e7tajEyC5ajLt9ENLS50p+EhmkQcq4xPd5gjpjNl6BqZzCe3k= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OZTVYy1PNmDZlKlKr7c29/xX1uBgXLvURdJE5RS1vsZK6hMsOKHwoSPrel8klQTRwl+gAzPUGiV3gm4dUoG9EcHyImCO2Yol8SVnxSwZWoUZfeqDCglLfRMvGKa/6T7aIbwNyr6ZMWHX6EeG6B0RC6bMZTjRFe7M1kePFsTw1qw3DxvyuqDJVnfqa/Rh0va6xnouSFDOL6GdIpokQ3Gq8wlU+/eeFNqLah6faA6AxydvzB+TRFJPX5vGE96+pzD93HsnLtR7Pnv5q28FJBaKG3PPWI9p+JIdv2VkQyTjwGoO+tEgQ5blIIgzBL4Rk9Wh2P7HqaU0+kyX/0i5hqyOh8IECC17KXmZHXQmnTZ3iOdUZmxLQWD+BBMf7Oi5EkI7f3GsRVuk+PlJ8f/QAkXVq7HeYBcg+r6SKhEIrIg1YvqHVJFNu08pI67C7SiBbZ8L X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7k4tmJW8Iaj2hc+WXK9SdVnc0RaKjRLHZg2UPwatXwo8YqwcbUrg39wLJrInHcB00cx2hILhcmmawIFtIM2d2jt0rXVKc0QQ8yVKYrgGq1PzWiyVn8R8Ez8fod/uyRk00OPx9KBbN31Hup5ADViOgA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 152b16dc-fde3-454e-db3b-08d9770daa72 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:42.9501 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 14/14] avfilter/avfilter: Report all unrecognized options in avfilter_init_str 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: KnfHvTMTC7Oi Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 4971ad9d9f..998db32d56 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -921,7 +921,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) int avfilter_init_str(AVFilterContext *filter, const char *args) { AVDictionary *options = NULL; - AVDictionaryEntry *e; + const AVDictionaryEntry *e = NULL; int ret = 0; if (args && *args) { @@ -934,10 +934,9 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) if (ret < 0) goto fail; - if ((e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX))) { + while ((e = av_dict_get(options, "", e, AV_DICT_IGNORE_SUFFIX))) { av_log(filter, AV_LOG_ERROR, "No such option: %s.\n", e->key); ret = AVERROR_OPTION_NOT_FOUND; - goto fail; } fail: