From patchwork Sun Sep 12 10:53:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084348iov; Sun, 12 Sep 2021 03:54:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJd/wAPinscKvTSLdiNRQt56Pr95vLKZdwROwKU9U6id4LWf94iUALldwDjrnoNzlQ/1bk X-Received: by 2002:a05:6402:1508:: with SMTP id f8mr7467698edw.255.1631444081929; Sun, 12 Sep 2021 03:54: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 hy27si1241307ejc.705.2021.09.12.03.54.41; Sun, 12 Sep 2021 03:54: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=GoKtaJs9; 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 90B2068A947; Sun, 12 Sep 2021 13:54:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2054.outbound.protection.outlook.com [40.92.91.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F8E768A8C1 for ; Sun, 12 Sep 2021 13:54:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e7yJczHJj/YSGC4bZIOBA95Eu62scWOrN+pbuTvvEXzi0zcybN2qAZ1teYy0Tuj0Ef4n+1jBBpyLtdgyXtjOe9R4E0s5gaZgehBAxfajcJ0VQEwrr70ZLiqH88s2afXQ/uPMuhZVh9p9f22cAUZ6CiVUJwAZJsuAG5wqFRTdOauy7d2Uvq+i9OBQceS2He8ZyRaOLgQIlau4n0dD9v2yIU5Onb1s4knmbpOSxbvphQ6z/rHPcG9oyYvFNIcslccfg6MvUFzXTVRwnbCXxVA62FPj4qn5WLa4Oh9UJhRqa1UKFoX+uXkQNPNlr1ZebYGacRDPzPB1whgOGqKpyBbWOQ== 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=onfZ2IfhcZY7fmks3/4kvVLVv3m6yXp90b76bvegPSI=; b=dx4iT2Ro5ulDGzMLzBlSz9Ol+y27XEZK/SUBteeqlS4sji7EV8N/Lu4s6A4gzvDNZ3UeZwsFVMt9kE+xC0XRmQPBzJqHwWBTf6RrJ8ybSogoEfjHMhetfzMGMdum378Cb4TUMLdgX+hOk8mHwbApGLOBn+6NWKfVowGBovntfiJa+A0i+nyCqXOAmJQdN8/23enlDMUGCv+Xr8iB/nVHqxCCD2e2Wfy/Gmf191Od/dVydlHK4Lf280PvOyQTNV4byN3ZlkVTbM3OqhQTVJchM9jNLmhggOTNvcRJWIKy+d5lk4/mFTlemNjyEUQzB2AGzio9q+WnMpzMD76i4Rf2uQ== 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=onfZ2IfhcZY7fmks3/4kvVLVv3m6yXp90b76bvegPSI=; b=GoKtaJs9s8YsSaV7wm9zbU1oKFcgweQPXyofsXZuPcMCnw8rB7OXA2y1n1DpTUEbOQXxdVPhfFbbmEGL3lLoIwzEP0zbK8Mn7ZLGxRuFFZsPl+MiXCS+mgAAzeTj5c/vgyGmTKRd/6NaxTpJI4NALv4xIuH9PANT4Qe95KqJDz+FLi7UBDLSKlpjot1KDCrmdGSf/upRlv5AqRI/DTHEEVhIOMd2zt+KmUqc+KocZYgabZr/1Z7Nv93xKfnQgvOZjDfac/W2u+E8PQbvq46dPdfaoYSa394rXvYQ1ZHtgSdm4mfIGIWgU7bIebGzyq8xcoKQuUsSj9rVuNiHmWXUew== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:08 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Sun, 12 Sep 2021 10:54:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [fW6l6b+UyoujXCEKcmtXaeGpsPl4YXn5] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: af4a6cd8-c485-460c-615e-08d975dba581 X-MS-Exchange-SLBlob-MailProps: vKxeIzzER/OoNofSaTKg7Jt3BsrGee2zsWQCNgn1ftVnsTBpAhjycU5SjfKPKw1FTXq9f9Ghjw+/bpFkca6V3q1LOSkFot9o/OfjSeDbsQzVOd3P3bJNfpPzMtlPHoZNOVGoeNBGSR0bquh2kmRiZ2srgJ/XgAQSVfhwY8PFSfAdB4GSc99Vyb9ICfJ3rOgLDNUBXsXr0XDFPBdCwYUDdrBwBP98SiWyH35W1pngpt1+phoRmnJZ6KOsaH6a2Vse7eylqfxpLJ+YNrCJm2wirr4MB1EZlR3WTDv9rXck2ruiu6OcXmFjYtGmWw2i5rd0ZxkYqFTA8g2eOEj29//cuPbzzClz5/pAXYaVdA9ztYV2GPj/4t89mioLNOXMxTfm9iujrPlAv/hG7Qrd7JZelgMtXHOeBQRS/sus7I8AF4OZbGAkCXPuqQ5iMhRzAKGfccMPcYSo/PhAy3WcCOG5LWNFkUPp4wFzW6MKdDRSCervhYrtFL4VPkTkIE2wsrw8poUIvOL1KhJnSI/dejpJTCC5v1xLGfJUGlC6We2wsQUKyRKhZAaoG2H+MODZG6Gr/fMiwjSv7G3NjCZN+KklawZ+dkyKQM7/kzieSJmK3RtnNWyFqN0JJxaejHoxU0dcUgXMzF+h32bkD+yVXARbk/abd8kbTG3PKkDJyJb5D15a6xXQ1qmKxRrvrB9a37ovGPh+vLVAL0FQd4Chd75HedtWroWexC18crobVplSzgVn9m2D3Fn7GvY4PUCxy921 X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nK16tfQFOr4dvSWsc6MjSXfH86/xNIQKrjm8xg1g71wCQf1xan3389jc0iYFNc6qNno9uU83odMLeFI5czS/7nhBknhzcSEvAWJDx4Cw+BXzOzVs0+fI9Jop0lYNtA/T7M9wVqbPEGlc/Gn6knwrFiDocYV5THQkqI5GwmazRaXSEc8kAOwXIniYpeMICYuONsn++PEsOVJZ4HmkOCacI6G4PgGLnVP4JP1ncUXoI2upQnBjAQ8eYJ8uu+OarhEsQ1u8q2JGvivezhJ+pGoFkJnthp6kDWjwKVyvveOxdl74E2BvZfu/A3fV1ZsIiRb6N0bNzqROR6tWYwGOBLdALdjSkj+G0Cdov7WKp6QXUEVE2UsmIxCfJAD/3zfMT37OykR5o1PGMVCZUZGACyGCkdQMxIfgQLa5mkp4j84Zypkx6X928VsQsmpsphlnlvas X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Xm0RsPVsKh9qFL2f1k6bQaEpfhWF2dq50h6l8rXEQgYIa7Kj0Bj8j+DfzDBw5er8xwS68fmuYXds6UDIIpupeBUpLAp5hQtx407AsTWzvuHlJZLBKcWIlmJS9c11qrqoy3d6r5we+WdFK32OB9b7w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: af4a6cd8-c485-460c-615e-08d975dba581 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:08.6743 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 26/38] 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: 2QVt31h6oLoD 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 --- libavfilter/avfilter.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 165ab1f44a..c76b74f214 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -922,12 +922,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;