From patchwork Thu Jun 17 02:32:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28546 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp74682ybk; Wed, 16 Jun 2021 19:39:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznRvGMIautUTRom6uGaqg1M8FMZU/zHJdL+5y8BVR5lJMPaW5SOZx4PKUUqC9FbILNVipM X-Received: by 2002:a05:6402:b6f:: with SMTP id cb15mr3532830edb.25.1623897559993; Wed, 16 Jun 2021 19:39:19 -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 kf3si1267808ejc.206.2021.06.16.19.39.19; Wed, 16 Jun 2021 19:39:19 -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=NFTLkaaq; 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 652DB68A066; Thu, 17 Jun 2021 05:34:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075019.outbound.protection.outlook.com [40.92.75.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 293A1689F27 for ; Thu, 17 Jun 2021 05:34:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LJr2V/ZJU5308vrrYq/leemD0sRxcqukH4Fcyd5Z0cujVWZFL8l2AIAprnij84b23tzhgp13txzDAUDDuHRwS7nJT0PewGgANLyLJ9142pmRUIUnz0eBBQbjTZzYzCpJn0Xf1mG2W1IDUyPwMsJc6JC+frFdKhyU2eNXs6c7eVz042u5tZg0USucg9kLXo04fmfbaV9ERHspC9c3GRexetOaIdhiK8KeKeY8mHLEv/QKmswsloQscKvXcBqC4skRWOPndbhPKZUfdZmuB/eNNOCAIKDSv/j4Mlc40ADd7sZgef+J51LbVgWtv2HipUxI7+6sv53xt1g1JHfXZW93bw== 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:X-MS-Exchange-SenderADCheck; bh=n+aaDEQH69DoXIt6M/5rFLzTjSlG3JOOuDAIMq46Eck=; b=e3+RONIHhsZ1o9NWoD86kODrucpg7JUsio8QC3VfnKE/tIpsBahvqITwZsom2yWAKDv5knwmM0OK0iedOJ9pNOSmsHLSZAlc6r0yntywHTkcM2PQph3yyZEGz/0+uWJFUQC1nzel7b4B8uCGAb8GGWG2zUpKEtfRZSp77/sFrvoMBE7RV+0Pofo1xRNVeSLW+AnysYcx6YwYhCuYHCqkvv9KCDrdLh1lgLMcqHYEoQ5p7L2SBNnE1+kxxxEOqa9AG/f8gl+V7DiOLmOAkxSfrUZltOb/4nhE8oTNGan9vGiDlkDP6BsjkNUy0UeBVpSApolrkpo390yR1KxeZBV24g== 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=n+aaDEQH69DoXIt6M/5rFLzTjSlG3JOOuDAIMq46Eck=; b=NFTLkaaqoeTtHEGkfBj9ey0g4zsnGGH5oWN7EZKRQsJKc9uElFz98Y4NXu5kfrGx9uBxIdRHCD1TKNOMlk3zvi5GQsOgfsARO3AP44Puoo1slPncNWwIKVNq3PDSQsL9sJlpgq81MJPCrqXuLdkfIJKzNbuZcteKb3bnbDWCw+ek8ZM6lJbF3l9AYAC9q5qJwyFM1uB+oaCIVMtnN9m2CE1hLDmqDRHzxtQG0NzykDdcLHgAh/oMnodsVZqwr8FSTKoF6ksW+Zt4wpvq8mRsGhLlHY8UKVLtEz3//kGX4Nwru/g6qcdHMZ8ve5kCVp0jmHOKL6hF6OrS7h1+9FYYLw== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::47) by HE1EUR04HT230.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::415) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Thu, 17 Jun 2021 02:33:59 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::4b) by HE1EUR04FT053.mail.protection.outlook.com (2a01:111:e400:7e0d::298) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:58 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:0E8D0A5F02FFA9585F876CC6F41A894FFD5C0D1BF8B835AC135FCF8459D0D686; UpperCasedChecksum:85A48E47387AB049B37B128678A605D79CEC817DB7E6F6705E30C276B0971481; SizeAsReceived:7774; Count:50 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4242.019; Thu, 17 Jun 2021 02:33:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:32:01 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [qgTWpRhc1qmmdmb1F0/6QFUCY3yhBiTn] X-ClientProxiedBy: AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210617023202.1318312-39-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:29 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 62bd599a-8341-4112-1058-08d931384b4d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULuBil78Tl/c0OuVoBVXnkCQS51c7W3ASPogBFZF6psrc0er4bfC9WuZ69t270I+sXEXINlaDjVflHzJ09VkjPmUoKe4lo5XIvC/EHJnKmzLVQji+P4QmoGCJtovDufPyFj09Dnn7kU2eKFB6lLQ9ByVS/acz2iRCa2sGZMdRWAnzsKlUtEqW6T7d4WwHIQ8DvrKP0WnLmBDjmonGIjZqim5qXN0OmECZ8bSEdxJ1gwxBIEQGgEsiw0wjq+gskLDBcnMqAJuiAAgdnNFYOOtzWB24CZS6+uGHqdsysesmvkVAIN2/xWpn0nAHmH3t+ZqXov+mkwWCVNE//xhQJw7oOp5dzIxUIvsMfz6uJ6bkTMwU5QhkbIuC9D5isodcTz+9cXzaaaWByzks3WElW9Vr6mVGOFUaQjPK/CMvMc3PQzLl1/2zSAKRnllxKENxzyaTTDYwMPRK78hs90z6/q/Y7G7BnU0/IgPkyRB7u88XTTFCbTjvVg4F8vK+Suk2V6Del1qPEVWotMDTASNxkKdn0oRxttLVVLT6X46+9i74JbcXybLA71qz3tR+Fc6MLDZbtExpJnqGomMWS7dR7biX2RdK22JX/LZ2zMm2grxuBvHHjvdcJRQ9LBK2t81qbE4fBeu8sn8zicGKZldHAJ0nl0Rxu+3NNc7Np5hnc9bY+mCGFAjyZZVhOFpaGvOOpDkuRamk8ybTn6kQ== X-MS-TrafficTypeDiagnostic: HE1EUR04HT230: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E6/hGqXjKfqFQc44edteNdvH1SIA+KI7v7grk6meFP1ambar0D9vHyFDz0DqJV7vLnbo+4azUUmVaUMdcltiI4w6VGmKSDcmQL6fYpoMNcR76nNKevbqon4+QFLNnSGe93NOQSDj92BJEC4CUaJiN1uwsdYBR7f9+oQqSW9saROsyGHgQvFbkZHPb4DVcBJc1xU2nF8v8OxKhY+W7gkBaCVRvd7845mct/p7iUB0QkzI9AqH3sUqbos1z6ej01Q2Y4z/oRK+nra+NxonXP4UTTZ+7Mp6iJQFbxcBZsqSdOpsynuQXlYBvmAkatec9AJCHoxFOFuWXKeK4Qx8XoPVO8AiAokvDQ/Vu8Ln1hfy6SF9fa8hemqZAPtgiW9ChfmxdS0QyI84VqlBOrYfrXBwDA== X-MS-Exchange-AntiSpam-MessageData: AAPZgU5cUKeifEde/H985VeJhKUWG27/wULIB7z3zCedS2HCugTtOrvL4ZLX/5tT1jjaSOmUbIHvK4fepeLM8BERNjNYWQDrwVRujsBON7P/l5E3qqEzWz35e2WVxR7fc5C4h3wrzDmtI3fBzHLC+Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62bd599a-8341-4112-1058-08d931384b4d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:30.3026 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT053.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT230 Subject: [FFmpeg-devel] [PATCH 40/41] avcodec/proresenc_anatoliy: Deduplicate pix_fmts arrays 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: jeTYA4mPU76x Content-Length: 2319 Signed-off-by: Andreas Rheinhardt --- libavcodec/proresenc_anatoliy.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 96c6f6d469..b7034eec80 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -938,16 +938,21 @@ static const AVClass prores_enc_class = { .version = LIBAVUTIL_VERSION_INT, }; +static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_NONE +}; + const AVCodec ff_prores_aw_encoder = { .name = "prores_aw", .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, + .pix_fmts = pix_fmts, .priv_data_size = sizeof(ProresContext), .init = prores_encode_init, .close = prores_encode_close, .encode2 = prores_encode_frame, - .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_NONE}, .capabilities = AV_CODEC_CAP_FRAME_THREADS, .priv_class = &prores_enc_class, .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), @@ -959,11 +964,11 @@ const AVCodec ff_prores_encoder = { .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PRORES, + .pix_fmts = pix_fmts, .priv_data_size = sizeof(ProresContext), .init = prores_encode_init, .close = prores_encode_close, .encode2 = prores_encode_frame, - .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_NONE}, .capabilities = AV_CODEC_CAP_FRAME_THREADS, .priv_class = &prores_enc_class, .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles),