From patchwork Thu Apr 29 23:57:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27507 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp2017801pxb; Thu, 29 Apr 2021 17:02:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKAXa2dmOETZyX9jfszEUcWFpGQDj/LsZK7QGQdEYqRDkzYRzWcZKvvcVKc0kCDDTp4DJ8 X-Received: by 2002:a17:906:3e89:: with SMTP id a9mr1028772ejj.405.1619740942882; Thu, 29 Apr 2021 17:02:22 -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 w24si1723714ejb.752.2021.04.29.17.02.22; Thu, 29 Apr 2021 17:02:22 -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=FAP74yc0; 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 081A568A0EA; Fri, 30 Apr 2021 02:59:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2102.outbound.protection.outlook.com [40.92.51.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A1C968A3BD for ; Fri, 30 Apr 2021 02:59:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g2NAeBo5UwxDE8t7DVBSxWD6hkyvFTtIwRGWINCCcUy+Julq/ZkOAJrFkh5yxrUm6sWSXy3ec7EHf/2oYDQV4LOMv9Ef5Ylv+DwjzoAl9qM2yBe3MQ4ZIKmkiADfzaphvVio69Ve0AyZcXR3eLJciTlC+wsdxzzcQRwVSBLFOLqNTLhb4GVMKn+qtyHVhko9/3yovW23FUl5D7zAzIo/5vQnPjoqjopHqTsVj6dXiRG4qZAYmpocto96RlxLBZM2vsX7HHJIC3JsSBkYXJ10OMfGUZ+JR5p3i34QGsFk26kQZ8j9ZKOEF73gNpSrDqpap89KevbF0tzXuasR2Kduuw== 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=XmiPmHQUySqUcfeNsxnpBgxdfOKMVpnSuCP+MJGzz5c=; b=dhfGH9J3sPeUpcmDKZJeTcFMVLO6Ny6eLSMhA4Q3RS/jh5ZDhwxpfVJDhkhZSik5J+V0K/QVQZrZgh31VjqjCGlKzSXf8kc1kTsVoVtxn9hvm8j4nDGmIXm8YLyXAN81O2PbrqC6hkhnYPtkGXMlmhJ0GoK9uTYSSw0hbbynBSFSkHbpDcxo7SQnJWnw5tnY85aexkkVqBbb74xIsqotBmXVy4CpqVQEYMtVzZksaxyyBIQ7Plxdbnk9BG6G8uPeX1YMUsLwMqrCdBhmGhZRzLqir0twCJNug3gvsqV5odCo9vCKnVDK1N8Je4Xs69Qaisd63Yb4/fhSfdPF6DvssA== 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=XmiPmHQUySqUcfeNsxnpBgxdfOKMVpnSuCP+MJGzz5c=; b=FAP74yc0nuDaU7Xi9bR0Q+z6yzicAKue0ARStfol5jBLFsPSjPyhBzQ4nwGNlqS5ObYdMHCJDJcb61NE/sGgBNE2/19KFK5csxVTyu7xnD2Ch9Kkcs7uWNZUY/BW5jxEVguoPuX7kAuqOvy9M+3hUmboWhv+QwvAdK+vcD8e9OOm7sYhaAz1wQ5sk6PtlhfnzXOGrf4XBwRIKwxi3fANtlQaSf/51yCrzJ/u5deRfi8Mdgf8qBT/Wwd9iYW1AZFYHoopjk3vBCszVp1dMH30PnAu17mB8XoWRdT9Q4KUz52/GbodEba3fGjoA5amDg2coL5Xhz8Qo59lYCcf3w70+A== Received: from AM7EUR06FT055.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::4c) by AM7EUR06HT148.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::294) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27; Thu, 29 Apr 2021 23:59:37 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc36::49) by AM7EUR06FT055.mail.protection.outlook.com (2a01:111:e400:fc36::61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Thu, 29 Apr 2021 23:59:37 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1758FF6E0BA6A5C339E9AD89694BB05367910AC411A74F88F389A47EDD964739; UpperCasedChecksum:522F110E7AABE44330F03CA39461FF1F365747C09ED5D52AD389957CF01B713B; SizeAsReceived:7576; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4065.027; Thu, 29 Apr 2021 23:59:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Apr 2021 01:57:02 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [oc3tHt1Off59cbSvL6XjUIsAfSU8alTl] X-ClientProxiedBy: ZR0P278CA0088.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::21) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210429235717.2067041-30-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by ZR0P278CA0088.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Thu, 29 Apr 2021 23:59:36 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b3818d3e-7f19-4555-8e1a-08d90b6ad80f X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8lZ/qLiIvG7M26yVq6lLwmYUabBBUV7sVkDkF1gNINDE7WsgrORU4+k00kYFH4sC9IZJ3QKzBkVcqvmHz++/DkAxV8IoV9OXMen+zUsexqlNuEp2ThtV5A+B9VPQKBSJiqJjGMEd7P3LMBEsVy1Fz3zagG4DLce6bry1+cwuWipohTvOmqhWCmH50yzUDhjKKp4JOU3uAKIeo1SAMw5CYNY0JZcmkvKSgltpMkQjZsYJVxBlMM/yEOcVV5AR2qNmzYw2eCRY4vdr6bhkgdUx60JmeORwTklEwSYfqSci04hcW/wpEic1G9Ic6tkbmrYCYTcsIBaWZji9lk5Pfl8jgz+TE4UbUJP9mpJ5VYnXcbC76TWxZOkXzm/fbfSu4b0+j5JOzoaixTVgbMDVN5uiqc8ViYc1ozNvg222SDRWh7EpfbpQ0Vol2Jh+kYEJFJPqC69snw81uSitReCUzyDkv2hWYn/4wD1Dl2sY96udMavyzsaMoNrQ+f2nlZ+SW2r+FUSOoW9/ANnTHqGrfqOrtQ3agnwnngYZ3iVMXCqix/+bR4tCR6scpGVi8Khzj6Xz76n5EoVs/VdTyj7ShXbFcvEzUK+XkRNdtW36c3IH6x5eUTScPVTz/yfv19+7WNsGBBbwratss+9teFDkGjZgY+DtDSTY62c1c4kPAFLAnF7rQ== X-MS-TrafficTypeDiagnostic: AM7EUR06HT148: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eFPOahV4XqA1lt/O+q5Fz4ex401Q/b50HLN+uDD1vpAXo8RX6BncsuELFPK7BKc9rC/cjp4RDKr1cOJTD3CGLB3dpzZejoBwCHpBd3yP9v/rkzCmDwJL/PkftBDINRtLc/4AoSR1rcsY7k+KO/gW9mG2+QB9674qI0HEk6t9braYQCXiQk/dCYJANAO4Mn5fXd6ZmdsjeqcRQys+mUN6LEQLWB8iCwW9YFAULZ1UtrslSYO+VGOtMm/4SF7FQoJnGlGl5eN/VtXqa/SxrCDV+wKw6O4YKHOEifJcY0VF6bj8MRhiBwMz4nrrTK2Np1RlDzIfqePDyKLprWTNnTmqZdtjL+bVbazK9TPxZx5euGKgXkQFOjQUo+m41+5P2gd7cyNokjKR8far4GFq7KPeMw== X-MS-Exchange-AntiSpam-MessageData: uPV4EuBGK+oYFLlRlXigl5O6MIQK3b8NIfI+snLcOcTn+gJs/PoQsGWuCmHvtfxEIF7MbVgkUgTq0++7V65TPOge/Nsd3TyvehmTq/ESBVmPAmjh3/UPOx9yju2YeIjJFlmmGiZTyl1ggiwwmkDd5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3818d3e-7f19-4555-8e1a-08d90b6ad80f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2021 23:59:37.1081 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM7EUR06FT055.eop-eur06.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: AM7EUR06HT148 Subject: [FFmpeg-devel] [PATCH 31/46] avcodec/r210enc: 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: bPXacGTzMGYh Signed-off-by: Andreas Rheinhardt --- libavcodec/r210enc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c index b143f516c1..2f641223d4 100644 --- a/libavcodec/r210enc.c +++ b/libavcodec/r210enc.c @@ -86,6 +86,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, return 0; } +static const enum AVPixelFormat pix_fmt[] = { AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE }; #if CONFIG_R210_ENCODER const AVCodec ff_r210_encoder = { @@ -96,7 +97,7 @@ const AVCodec ff_r210_encoder = { .capabilities = AV_CODEC_CAP_DR1, .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE }, + .pix_fmts = pix_fmt, }; #endif #if CONFIG_R10K_ENCODER @@ -108,7 +109,7 @@ const AVCodec ff_r10k_encoder = { .capabilities = AV_CODEC_CAP_DR1, .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE }, + .pix_fmts = pix_fmt, }; #endif #if CONFIG_AVRP_ENCODER @@ -120,6 +121,6 @@ const AVCodec ff_avrp_encoder = { .capabilities = AV_CODEC_CAP_DR1, .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE }, + .pix_fmts = pix_fmt, }; #endif