From patchwork Wed Sep 15 17:22:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30260 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp484449iov; Wed, 15 Sep 2021 10:23:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQ70lSbkiBCXDa6HuS6kGA/CG/1sqW8nYmTmW1c1y8kQRLcKQ24mVrDmVesxGzbMXESKnA X-Received: by 2002:a17:906:9401:: with SMTP id q1mr1146169ejx.313.1631726598403; Wed, 15 Sep 2021 10:23: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 g8si476936edq.535.2021.09.15.10.23.17; Wed, 15 Sep 2021 10:23: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=W636ya0Q; 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 02D3568AFB1; Wed, 15 Sep 2021 20:23:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2013.outbound.protection.outlook.com [40.92.90.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 326A468AE51 for ; Wed, 15 Sep 2021 20:23:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZC0j6yOq3K2BNKVGxCYyCjLW2z+MVVZNuCT+qxeDfC3zoDGco1TK/VixXuepF9vMzGl98SMTo000/p1NqoYkAxDb51Lok0yFGSWO1oJqz+bpWejEZwB8O2Ig8AQEvAtKXBdo17pnx8CdX0rk6FwTI9/iksAQiXdkN6mCRWdGnA/V4rNxZc0DWbtPpB2luOwadrRrlx4xnPE/GntU8uRIzc0MrdbdiYvn1j+7jc9B+uuizs26m5I2YBBOc5IxcvP9ngf934UUshiCQ6j4b5uvNV1pkbjEZ9G//Hwnb8K2yD7Ak5jGXPx6OKy8cnp1/h7eKDqAXpJOLJzHEN040BeCOA== 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=r5TdglbS3HKr+CloMVdoaBhGFxYmyZqnI3/arIacg50=; b=Bt9ZTJwlKok904XORlyDnFRvd5lEOr59AHhF0lu/lFZZ8C0OXCYineFryLHedKqfs2hF5jyhGI9dZ9Fy/CIqnPfV7raKUJ5p+EE3C7Z1u8sQpzgKl387hh2A7vbLIJCYxXWvgPfdJlRRJRqKV9IIZkMZJWrSks5yh3yVk2kyNRXtpFg4AHDGJIBqMuC1CN24lrbejfn9yo2PZ3SUBupcdNdbZ0iWUFBlqyMhRKs5U5SJ4yVrr2lUsiFIcrfS1lqJBPC5ORVx4tsxxFuUUg5OWk2Zo04FoG9046ndW8B5eaawEar8s1Yq61ymjAe9JxyKtfOWozqKE727xywF7PHfOQ== 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=r5TdglbS3HKr+CloMVdoaBhGFxYmyZqnI3/arIacg50=; b=W636ya0QijLZhpZuj0HiNbDRyKizAijRI1OnO1DrpgqxrLWgD7MzR9lQvx5bBfSxK7v1afuoUsOggOw7Lz087Q4a4XntUOoIjoFCEiLV29IVJfe9yxpIwWE3o0W77eAySvHhbG+YdZAc0l9rHn22Zba/Elfj1kRnAeoP3+YMDFFnZISqD/6JQG4GFbEJVpRHeVi4wWQxC/W5m1XYzDXvtQOovz/Q4/5IZZsErj2XsqmZ6dkDvaOqsrBsJFmgMXXgn9/21WSqyHK9ORKdif4/Sc7apKLdyktdpOveb4IKqMz4dgUqSN5Q2YHXfapkaz2AGkI6fMcYi/hfUYBhZRFu3A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3957.eurprd03.prod.outlook.com (2603:10a6:20b:15::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Wed, 15 Sep 2021 17:23:05 +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; Wed, 15 Sep 2021 17:23:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Sep 2021 19:22:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+BIAmRtQKhj23sdLwP7v8Xr5WgtJWZZv] X-ClientProxiedBy: AM0PR02CA0153.eurprd02.prod.outlook.com (2603:10a6:20b:28d::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210915172257.4090685-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR02CA0153.eurprd02.prod.outlook.com (2603:10a6:20b:28d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Wed, 15 Sep 2021 17:23:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e1d4f44-dd67-43cc-62f3-08d9786d7a89 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3X3eVjtKbgI22CZAXZ3l2idOKqUB6F4emxIu+vZXa/fNT8yXU8/uXQhhtG2JyShyWBxea2ZXhc6dmB5DYd7J32FIVt0Mz5Imuv9XSj8h7a2cuPWJXTNDGXClWreBf2MgB2KLh8qhpBH8a63WlB2PsJYfSZBMDeB4W0BRok8UlcaW1CIPpAf6khmQsAMzEJ/Op/JTbM1m/Dxst5KKlrR54IZaAbSrOR6EUF726Y6NqZdQ59ejdLZ/JdV0bZwiM0ubeiB0QTnV+/7vIUyhuPgZEyouQIIEMYYRbhkJZU2rKhA9/+ivTkzZxp1MhxNMN3TTOfQOyg2Y2tuCveYxxAmNf0xGsKl56IOWOGKTw3rlc5sqZp9yh1XzjWpAL2Wov1FMDjTBWrOmAjZAO/h54iM3dsjAkw/IEAIIk/BKmvld3iC8Bt+1Ef01PPpDhGGCIUkUwjbuNB/glR4wTPRgvG+6ofZWrpfK4YQmlCePmXEK02rXbjM62PAgdT5HBIrxd4yZzwjdwSg+wB2lN6fJw2AIC82m4a+Gz+r0fNeRJs1LGtdGvYkf7WAVXUZhj/wZ+SQzTdfAOL8RZKFPjHxwAnP7erSeSUPZzgK1mdWEjl6HiWIV26JwX9xpzcQm5nxBvVpyQoJJ80Y6HvyTm3EpeLrff/jvMadNl9ZHLKDK2/hb6uokGFIj2FP1GVblPP93ICHDrPwIdQi9d5IMXTQPt0W+vwV+1sbPHieFXw= X-MS-TrafficTypeDiagnostic: AM6PR03MB3957: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J0Oy9eLBa9yoi8MLFaNj5sOa12vtXCNJ+ujiLz5FIV/3+bnIgIFEFfieV0PeJDErBUFU4ceUKvT6KQbiuoXfZF29D/MBdWsqZ254kwYMq68aTE3xj/0FyEAviIiTT21nwD9ar1VQ2fUpo064aOjR9qnPGfk4GgGZjBye7E0ubvDMAu6mrU1uk4brxH6KkDYXOqiqRCA+acjl3OLafbn4ZF3kN8OKfltX6TjfUInaGNKS154Psjh50ddP7Xs8BwSwS9poel6Pg4MdUbYQeLk5nOEjX4UySkX9zyle9L8ccgzWRJ7CXrNmlEGXmCZO00fP4vhly7CQsKoSsza5RmDdXNmqkAv7GT8IPDLXdAb6y3zn8+JQrAJdAGcBBfFTGAtBlmtTTHETM6z2HedwnGx/Un6SO6D8gscWMc0yCcMd0BMn7xPzAPkBFonxFeSVFCm0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TP8i/vqyiwUS8g9JOpDWSuTqjNdO6iGaZ+bFlbXLX0q1M8kgUvTGohVf6X9YPUWCaBc1etfLoDLpjzgQE5j1olw8E0JRUuRoJ9qxlVEG3T/Ft1sJ/JT6ZJxD+Gu8mySXvQckuWJzftnkz3j5sJ7emw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e1d4f44-dd67-43cc-62f3-08d9786d7a89 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 17:23:05.4617 (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: AM6PR03MB3957 Subject: [FFmpeg-devel] [PATCH 2/5] avfilter/avfilter: Actually error out on init error 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: vLDbKybxTTbv Currently an error from init could be overwritten by successfully setting the enable expression. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c614eb0740..ce63b9762f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -924,6 +924,8 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) ret = ctx->filter->init(ctx); else if (ctx->filter->init_dict) ret = ctx->filter->init_dict(ctx, options); + if (ret < 0) + return ret; if (ctx->enable_str) { ret = set_enable_expr(ctx, ctx->enable_str); @@ -931,7 +933,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) return ret; } - return ret; + return 0; } int avfilter_init_str(AVFilterContext *filter, const char *args)