From patchwork Sat Sep 11 23:40:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30152 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757347iov; Sat, 11 Sep 2021 16:43:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzQj1GLCvdd077JtMk03ZFY/ZFhPO1yfnFvk7ZIS8JQGrcdS9NwgkSaY+46FevMku5Ycuj X-Received: by 2002:a05:6402:5163:: with SMTP id d3mr5445518ede.220.1631403785945; Sat, 11 Sep 2021 16:43:05 -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 la20si3914387ejc.3.2021.09.11.16.43.05; Sat, 11 Sep 2021 16:43:05 -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=LJLIFxu9; 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 3FDAD68A96A; Sun, 12 Sep 2021 02:41:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068093.outbound.protection.outlook.com [40.92.68.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4367768A8C8 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d8qrA4KZPJ1BORefys9PJWCiS4y1tV/OllUgCrg5NAXN6aPDqfqoNh04blVa2NK1hzPSyBrkgsUjL63o4lDD0yrsuw6wTskZEKNExbX2LULFngkm2YtIxD4GR77sSdHmBBad2RGpzvmPjRa3CNNSyaaZcUaK7o+faaSuPvKhVhc7PnHbiZ9uDKM3MV/QspBRoLbqX0bWPpn0gyYwjbBs+RcUrDZavxwCO6bYZiy1IMdlfEJHp/GF9VjBDt+qEaS6RKdHDFqH5az9Faq3Csolj97H17J1cJSL1Ka5QbBWkE+XG/qk9GY6J2vusV2LWdMJGd2l5qpZaGAjzannCok3DA== 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=nLXDmEteTtMWWVHAHRQ4dWqb71Vo0Ddyb4/Sl5scEMI=; b=WOY0dlpzchPIQq1X+1fBu8x+Q7D8fYGe/C/f6WBSMV9XeCgOTOVBLLJYBDe9UJ8nXgtFN55eXKN0S2TtCOGDON0QK1YWHdViv6dE88+yTerDlkw2KB6O9NOHw0LK+GQiSPWVBMcZUYmbp4M4iyifRf47ZJlrXFYYqG5xmlhyHU0OSaUN2msZgeOJwuB1fQdy1rMHBM5JJszKEl+fpzZEPtBtSv9Pi+F7LQCtLrH6F8Yn4nIuOltuEalFGBDtyigJLkkc9R0muDOCzHyTw0xBR9GQph4tVe64gG+09X27x2s7P1nzwdRkFv6tBQbVA30P/DQCJSClaToca07iY6Z+jg== 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=nLXDmEteTtMWWVHAHRQ4dWqb71Vo0Ddyb4/Sl5scEMI=; b=LJLIFxu94tHjl/W+6exaTz2TmqxtVXi498EwBWMhUASD/UVh28vubdTxJ94eHD8nQmFJtDCNAfkz/p7URseaT85QBk1P0sXU5p6CThWzPATaAkq+viUA/8fAcDv/VaYx4RBPto2eVFOGd4gzh7PLpE4bsPLEr8DsYq9g1IDktAkVQEUd6dK0g7qlITdBwpYfAB7PeTFFzI6WOIYVYLaZIloJLVoeEmEzOfQVT96EgYLr0sqYRJps9Xb89hiK6sjhkrv/hcCaIKL52/IyasY17dWpge5InFDRE5i6qkjWTR0xyp/Q4pHbyhvIJ3+kqzpuXRo/VT5CkFmQblGQGnXVGw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:41: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.018; Sat, 11 Sep 2021 23:41:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2+6VxdELPlO3WN3+QsM32P0n1Wj9X3OO] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Sat, 11 Sep 2021 23:41:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96846b37-6bfd-4554-f982-08d9757db172 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UK2WvWpU8a7bwaWAHGhJ/PKl9Wts0dOnUP4HG0csazhxOVVPa3kLGu/Ee0BE/CbIjooNh+KN66WPNl4j+B7o3WZpUui4KHOHhKrk5aMXwFNAjhipxIgyzlTkPptMpF8iTDQQagFrkfS5F7Dr9srmUjCDOlG7vq3F7ojWqMbLYkDBwhYHN46vNofXBIS6XemxnrIuQOAfjkLSkuFKIYxOL6rRb6fnph/lgfU46Iz3LxzYl95APsI/LU7ZNgF1dHW2M4E1NCPw77OKODm7qH2oKUdMKIC3OPIaWHql4Ruym3FWAAgw1fNosGCYLVkPa4zIAxbmd5fFhenbjNh+iRNyUVvR7h86IPK1ODjoWxadHSObRK4O1iKa1D3uQHsRjDcSDgoa3QvjQRzrcOvTZp0yTYMRK3Ub8uZefLJ0aIXI2PkUFfuzLUwbLwHQ76/bOYtGCBH3xFrUa8b7GmV/Q3wzqOYXiUw9r934VTUeBNFSksC37IKRBUishfkfVkgbdH+oE1Y1se+6etMZK4FOsiZE0qIvPSkJdGPD3HBc0XOcpPlHbmMcGrij77aG+mk5Q3ZucKzs+zinlSmN0RH1rMf10peSXZCNyLvFPXGYivWjtMZz+/W/pU23AHPyD/He5BnIp5s35pZfDaXid/mJWewmwmZhmA3P5P69C4Ef9JlXqe9+hD8S/VRIkPurTbYBBmqMqnwXKn6d5CDOg== X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R0XEFNdZVjmhnFr+VxYlP1KTclgPtoOQFpM3UZ5WGR4455YNVrxBWUcsnTkIUKVuxOy6EzvDGB7O2fPXD2Gj1O4h3Z8mNc20FA7e047N73dBvvaOWRFW+TlpUkwzcIYaWx31xxAntK4ieIbM3j0Bm63r/qKDKlX0ci7YEzDUu+rR7sGy3Upqzm3/WiPwkmPSXHAs3mEyMWBXvj7ldnibztjk9hgTA3/XAwfIvMLCg5bNMNGoWUzDuWFeorzGS+NE6xoCFz89J/CULgDx3mcwlwBbuPZtYX/YxRLEs03e1eH+Mz2ZYhSNluLjZgGuOsiCj8ZrrYBuroKdQvm18Mz8+7jODaanO5ChRWWNlY1eAX4RmNPYnKRM+qYxuo9Oxh9fhQAABP2AiOocRZUhpHeBcdIqLz/PPKdnsBXrINqM+F+y6cIOiBTcFsJ2IwJSYoiJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zs+9JkVN6h/YsdivBvsqVnBXy9zJcwIihpYEHS4KXY9f4TYRKgT3lFXFBD8XBUtr389bqDCe951NlPiqHx+0MKS7FahPvdfzNso8s1wklnsVPNuA8b/HK9bhCifC9ALvU/N/faDrzmFU8Gt4eDkUow== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96846b37-6bfd-4554-f982-08d9757db172 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2021 23:41:36.0001 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 16/39] avfilter/f_zmq: 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: FhNvrqUV+q6W Signed-off-by: Andreas Rheinhardt --- libavfilter/f_zmq.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/f_zmq.c b/libavfilter/f_zmq.c index 5de22e2fbe..3bd195f0b2 100644 --- a/libavfilter/f_zmq.c +++ b/libavfilter/f_zmq.c @@ -203,10 +203,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *ref) return ff_filter_frame(ctx->outputs[0], ref); } -#if CONFIG_ZMQ_FILTER +AVFILTER_DEFINE_CLASS_EXT(zmq, "(a)zmq", options); -#define zmq_options options -AVFILTER_DEFINE_CLASS(zmq); +#if CONFIG_ZMQ_FILTER static const AVFilterPad zmq_inputs[] = { { @@ -238,9 +237,6 @@ const AVFilter ff_vf_zmq = { #if CONFIG_AZMQ_FILTER -#define azmq_options options -AVFILTER_DEFINE_CLASS(azmq); - static const AVFilterPad azmq_inputs[] = { { .name = "default", @@ -259,12 +255,12 @@ static const AVFilterPad azmq_outputs[] = { const AVFilter ff_af_azmq = { .name = "azmq", .description = NULL_IF_CONFIG_SMALL("Receive commands through ZMQ and broker them to filters."), + .priv_class = &zmq_class, .init = init, .uninit = uninit, .priv_size = sizeof(ZMQContext), FILTER_INPUTS(azmq_inputs), FILTER_OUTPUTS(azmq_outputs), - .priv_class = &azmq_class, }; #endif