From patchwork Sat Sep 11 23:42:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30165 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757742iov; Sat, 11 Sep 2021 16:43:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmeByLzJ83yOzGlshy7cwelihHQdWXApTEBS445N/RhEX8ZgulGda9DbMaZWx6kBRK6Sp0 X-Received: by 2002:a17:906:1341:: with SMTP id x1mr4688686ejb.277.1631403830730; Sat, 11 Sep 2021 16:43:50 -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 i7si2743299eds.165.2021.09.11.16.43.50; Sat, 11 Sep 2021 16:43:50 -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=Xi5B0nrC; 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 62EEA68A8C7; Sun, 12 Sep 2021 02:43:05 +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-oln040092068087.outbound.protection.outlook.com [40.92.68.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBD7568A8A3 for ; Sun, 12 Sep 2021 02:42:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KBvPt3YFr2xHYYsH4KfUJhuwS2D+YyUia43RyNQRUvSoRSR8igqF6kF+CxXcPVTtbzmXqDckNR1YTZzl5D3UB9MzjAzxvxlBRlLNUXIvmADPMVXhknicli0J/xVdoMWyOL16QSb3/HWdIUvCMc5MmtwFnXUrRyjR79TLIzFsnJiQs3SnZeJiSla/fZf2on2LpnsXxw7KephgAzUBwo2Qvw7517lvs59ZSPYrbpq10LtHiPR15cYtrcp//fa5s5JoJo8jbT8/flavEegBuIB0h2fjjC3XZGAVJd6dI/2RDv+KQg1NluGQFaQ/i+cfHHve4/G7siAFdj1lxXZ5ZKuiGw== 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=us2h+H9Mc9gI/hisfM2Qx6MpNXsy24OGjmbFPX/Jwww=; b=UpAn3KFLFKOzm4IpGpoYZihKAwHwwlYkTuoEIA+bHgNpmVIjT3On+atZCByLIrbNTPii+2/dsFp+V7ZnQhWRNtZ5UFYRH25nlSMM05u/wX79iEo7Fwa83v6MtizDvFXiqQh6qMsGgn1hfkJbTF+om77rksEB44hwEynFk+c8diwfFr6r141v2KL+WU3cOr1CRAI6nRn6k1Gd95jLfQwxxtNtrMJCZ8PFGy1xpG/csjnG+B+ju84c56RbNyxnWRbndoJ3H82Y9HH3cUnpLgY554jRPusPpIMtw7LeCceHKNNJV2gBfKQyRvrJRjELrydDfiwcgLMzLgyFpAGXxTX0iQ== 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=us2h+H9Mc9gI/hisfM2Qx6MpNXsy24OGjmbFPX/Jwww=; b=Xi5B0nrCNlJ1C+dHtTTxBRrVrWcVpBuZqRcFPMhpsU9k2ag49JAB1YcSu5x7LylX5Wn49brEVgc3aL9pHEYnIUp0TFZiISCpvosAF1/Xgcn74diYLUKTICCB7xEJ9xSTET6nWRQpwQ+LRu4ozGt4WD9o2rS2dABopXcuf6b9yXLOKfKNW4ep5F2aA45QhGco5LoI/GrtvTj0q93mUndbV+3cQZyVXbT8Cpi+E5R5wNXvYq2U6BzzF9m+CqQ3jZScYW4MyvjUVeAvi0Kf3HQC98X4bgIDuwLIAZhzpOWg++e/hQpvDrAyaOio8GUrFu9OqVKnqzs7EjJguuwZccJ11g== 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:42:57 +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:42:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:42:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [OPHYwCRNX4gcKu/VLaS8Voe50yQZqCWV] X-ClientProxiedBy: PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234244.2306938-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) 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:42:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c1ece24-b608-48ed-beca-08d9757de1b6 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UFAju/N0FeFgknNl9FmpqXWZvrbh57cNu+CbeocV+fwduHdOZiBz5Oq8IHzarge+WN1LavdsRpNi/irwf1HCgbDvx4TPyuo+nKTPjjKgPtgpf7o2PdBzscv/m7THuNnXOrp61OpHLQPEN6/NONmoq4YFIzIQEEEnYkFm3QIGZnAP7nU2TmU7VYFDh6akcI0P3nNJux41MevwzPbomxWIUUn8pP3P8adLRHWTGWstu6c94mHuwykgN6Yvck2eYkUhGHUn+6oJXfR0NdAVp9h8hYoO9K9htjI6ZynRPtM9oi1NlQk+bLlVZo2zBH/MVt65ohvjqt0H78kXCizIya4fvXIQCsdmvWgfVQZf4+OD7yUJmGNmSPKvHLfDTJgL8tH2x24am/UkadABXxmkdv3kkR1Cnwr+YMfXmcSx7Tb1YU3NPKEdE7xRDWhkTyYqOZmttwELe2Xpu7nyiNYGwB3mKQBu7Lk7g13fspy/tLFykjUkau9+VDV92ATuxpPU6CrFsi3h/Ged6+8FWN4XCZZJx6VBWr5YWCoTJNwOa9Zclyksx0RbU7WymY/cl0AX/LjhPvd94030zAym/tF2MtDeiFc+6EiJt0lETpNJYaPItGZssO90LNxlo1LitwiefIkyDg/Xzn/5Sy8IQfkPqtyKleQxs+egOBJnds3TNfBUHSCiyV6kj7tU6a0Jmfmy7sfBdsP7w03yTCnMRbZ2PHVKkwkPdWlwXLzyk= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VJGu926gIaJsszopnP/Hxs0S4z0xyLCtngo9LD9EKJLdkxoPrKKQ4w3z7m8vUI3jxg63yivwMwdd/8BzknKvL6oqfT1N0q/N5RjBz0IATzzvVDhFigYSlALukuO+3dmbF141XRS+jnQT8l1TGa0aqf9GATxaiLnHXDTr6TmwbUFRrZlhOcyHEGzjFhY2cTZg0+4flDmWasOX7res06X6lQG1Wj6sQFNSa5yIZ5U+tFRFMpvG1XSU2iyTNGzLx/zHJAEe5onG/4ztxX3/xk8gPqv7MFPZMOgON09eV5R2G9I+V18CNCRv/uO5cCNju/JcjQZuqWU4FQEyIaLFYNnta9BbEiKnZCe1ogSy2YKWfbXA6hvlK/aYw1/3/V6xjlOxNIlxuh9lCDCp4FVQ/XPrCvHk7EbL8znOimNXDqCgfXvT4kz6vE2X/PQvsujFXn66 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GyKbCWkmaIHU3xQffZ62GF7STvOvMAqH4xDqQpYEN8qfCEEZfO8oNmHEMfffnwtL+QLfO/C3++2jMdrppsAqnO+3da3U3USsLmCcEeR5RXl4UKuSJCDxXCiF6e8sb8RJ5Z5gVxFZkAW7QYSGAWqDJg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c1ece24-b608-48ed-beca-08d9757de1b6 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:42:56.9888 (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 17/38] avfilter/src_movie: 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: 8sGkhfBLB87D Signed-off-by: Andreas Rheinhardt --- libavfilter/src_movie.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 0d63c1e4bc..27b17c6a9d 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -630,9 +630,9 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return ret; } -#if CONFIG_MOVIE_FILTER +AVFILTER_DEFINE_CLASS_EXT(movie, "(a)movie", movie_options); -AVFILTER_DEFINE_CLASS(movie); +#if CONFIG_MOVIE_FILTER const AVFilter ff_avsrc_movie = { .name = "movie", @@ -653,12 +653,10 @@ const AVFilter ff_avsrc_movie = { #if CONFIG_AMOVIE_FILTER -#define amovie_options movie_options -AVFILTER_DEFINE_CLASS(amovie); - const AVFilter ff_avsrc_amovie = { .name = "amovie", .description = NULL_IF_CONFIG_SMALL("Read audio from a movie source."), + .priv_class = &movie_class, .priv_size = sizeof(MovieContext), .init = movie_common_init, .uninit = movie_uninit, @@ -666,7 +664,6 @@ const AVFilter ff_avsrc_amovie = { .inputs = NULL, .outputs = NULL, - .priv_class = &amovie_class, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, .process_command = process_command, };