From patchwork Wed Dec 22 03:25:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32829 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6023090iog; Tue, 21 Dec 2021 19:27:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7JZN4/o6cdsoPsgjDkOmEPClsotS5mGtAn2oe1xqCGU9QHqs5YHgCKPZ3fEqp2veL3YT2 X-Received: by 2002:a05:6402:4405:: with SMTP id y5mr1100556eda.179.1640143632980; Tue, 21 Dec 2021 19:27:12 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb19si393955ejc.411.2021.12.21.19.27.12; Tue, 21 Dec 2021 19:27:12 -0800 (PST) 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=meZsU8+F; 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 6EB7768B00E; Wed, 22 Dec 2021 05:25:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073083.outbound.protection.outlook.com [40.92.73.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B227B68AF8F for ; Wed, 22 Dec 2021 05:25:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j6X5l05QyNwZHNR4Md4m1/xEHOOUGpu+TVqKELu2aWYH1qzeiyXhCRgcUmTy8xIydSrQJcJbydU7ig2mMQzbLiiWiyIy90K2CeST0Y1wusVVDbjrqVm6hQeF+FUDJm6XlSreOIvb2/gc8X9D9/y2EdpUk2+p8su+iB4wuErQywE6i5awLfLgy6wghxPYc2vBgIBr8kjJueK3kYWJ+ZlIV63geVDrZofO7IpuNGuUU5F83RAmkPFPFc/Mz4iDYmKaCKMr1X1iqxMdyu2juPZ7dg9T42WX8RnYAs5EUUPn8p1yTeo/OG1xwjFDuFbuMyf3GD1a+6jF1F0YtOl3liZlKg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2PySVkJgqk8Brg4QdAIzPGl0oNh9q114iw1Flivu8Tg=; b=ejHxM4zSunlKLI8ySEWK5ZHFXtueeAt1TQwS/pbS//dGYvuV/PYJqtC7eVqlk1CeUsEDBfwy7nRxVhcs0UYDdqzTpgA3QpRNhy6atC4QwI+fAUvY4UHVu4ctuMG3M6FGHzY+mm/ZaQNS/TgI91v21zU/nvwn72+LEc7zL5E0ij71fqf/VC/JY1bIGD87IxdeKGbP3CS5e1d0AGlPlo4ud7jOu63YIQ1RGlaIkAYMYMW4kd8zicAxwSvrJCPiy9L7P/w2/fVUDxX5VG5zVV7V2cFAoXAJK4ZEZnMqXEaRKz91HSnfYQ65lSlCpMDv+HVj0BkIhiI3+N0nmOQ7Br8Osg== 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=2PySVkJgqk8Brg4QdAIzPGl0oNh9q114iw1Flivu8Tg=; b=meZsU8+F/p0Wc20Z7g90yWSZ/EUKK7M9oG7PYXvLFqYaJVGsXqdqFzZhH4cxDp7EPnMlpjimhoDdIg/QHWgY2T7yWp+E+yUqfQuwt6stkwNBG4FGsfkXrdjAchmTftczm9jaQcDoMCYbIvo7Dt46710zb9477TU7ELldTZ77acRJoX7wXMI3x7kn3CLRdwOqtNJiwV6zJqFQvjT0ZsqgRD2VME8F+EusDGhCq5J615z6tMEq3TV7ZELCKENOT9OKt4HUFBL+GKwVEYKVZlehxdpXHpT+swUuyG40zUl21521WAEbHuNpWs2jfFGlMsNEt5poa6EWI+I6diaQwklL+g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4104.eurprd03.prod.outlook.com (2603:10a6:20b:18::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.15; Wed, 22 Dec 2021 03:25:39 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.022; Wed, 22 Dec 2021 03:25:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Dec 2021 04:25:12 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [gNF2Llvr+kGYr/RL21a6O7jYvRRCGWNP] X-ClientProxiedBy: AS9PR06CA0323.eurprd06.prod.outlook.com (2603:10a6:20b:45b::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211222032514.896794-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8cad8817-ff3c-4660-a757-08d9c4faba25 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JFaVFuP8rJvOAke0sMz3M72JxTkpcTImvWLP6wDNG5FmGTbioh3ED3skzgzwnr+P0tnzsLAg6/F3phNsqyCvdCF7QfbW92MQlk1dTqsEkp3fofJOoja6u0v3L/l+SOZ52gSD0iWkIZa1WLy1t2N/MLNX5b1EhPXhULfqj+Pir3OHMaG666dFhAWdkgOH8206TjQtBnkrlgD5UmquAUnmDVuHOvj+wjinEr6By4Tn6sMU5ygeMHORhigFNt8Odhjb1aYcHj5ULbI6KlASnhE/qjy4EdaWzcwCmro4gkvx4BWF7pbdQ3XSIvbmuUYPhw/7HjVVw9FQU2w/eGxQX+C80j+cO2KiaT1dXDwJygtomRlIejd12mAjgzHYgLGzY3tAqjLRYNIJrXTqrHXD/gvL+12qPPB1oMmzZ1SMeqU+03Pwo+TJDJO0i4e8U+TZH0Jg97vt0/JzuiNAddK9DqQW1xNMJd3ZhPn+AgJXmZ3a/Bj6Hub5QdQURhWQyEBR+QKkpLc0jserpLsGQ5spIUZdKjJVIJLeRagkMuv+2/T7IrRfxmmy8fFP+zK0DH7hhPfJ5P6eXEiEJYX1elYmxt0Xpf5Siu8FoxMFJDCwUTwr79THP+iDzyVOzDsaq1+lQt7RRiVECaT5aBYBLYQn8NLgyue+N3/tzK9A5Zipi3bm+cfpGxjCUWA9MgqhWLo+W5Cn9T5PGUAiHHfq3eu1P+d2CPwTrTl4Wk1O3y97VX5tb6CI= X-MS-TrafficTypeDiagnostic: AM6PR03MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E2XleXA5aAyrXOJJ+jFS7RzuZzP6Illtiwu8e0YGzxcRvgRQg29Izk9KnSDrpKMeoRy1XLKSTtfKHuN2r3BOQQ6MesnTl2zNiOuZKNx2NoT77YXnFt/7CYhIO3wnJ4POaKDckR0L8u9gakuafTDVoJFzmX7s9ReD72NlLR8HGuhVYcJpP+y8EjR8sWP9SE0FFcXDBj3t2j+k7NYz92CFjrtMJ3N2G0xV6qGC+JJQbM+aCLm63B5N0S3Vc6Q31ygGsYv5NCDHk90vgHonqbPPuEyi35f+8+9KPhQ67cMjJJ4LqX9ecXykZCIygAxC2FsUbFpbdC+0gq6sl0HRu4ZgKZXZtw+DzBvp43tphgDUsjP9zcQ20CsPAwHIMkgEMmiYVi0lmi6Y/orRh274aY9YgXZMDSFX5wpiMmQp9WCrN4W4VeLk1QYkfcCIyloINzq+vJGcJS9bjLAyZrYmZj7bamHSZ04I+hEuG6qK8GxolcbXcrYE09jZoI9aOXtpX32BHKehZrxIXBSC6GoIg51kc1NRtypQip87OqFoXX+kdsgOh9dUQxtj1HOZ7u0p/X08tWtMWiaKxp8Durp4Pac+lQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T+2f9CUSdLqAiQhrxGPyyd3PtyAbc6uVt1ILGANRDddS1EOuh4AtBqJcGXEr65kJWkCL+nt63vUn5Qw7FEeifU9FToJQQ6myh7eLPz889VmzOjsY7iO+oUK0nqaiD9HE71vAYA+4UqdwBX/gM321+7BjmLvdtkHFmrPAvaesaW3OGJSxx9Gx3SE/+69+6Sgmjp1FJXi405gb6OXrLfEx+fRbygFots6zOsPmrVWLM1Tp+aBwsTGhCwEr1BPHAgfctfaeyX33uVKtDLhUnALK21IIVcYURaCib5GELMdjsnroyQRw8M0tHlOVlWVsTyUPnYaQcU4xZSp9bJQyvLIOotxYE1dkhPQTNw1xfoN6BFi6hRpqMixYlFRxNUoII0iy642qy6vKJLEgdtseaMARa37MBUspIo1Y4xIL+LqTqbBLtkSfwns9673oia7ayvuYlvqz7qemaVb+gjormUTCKCtWwyn5uFOqbRDa2RcN9HOCB3K+o7S1utlrj4SG4880ahHhfOWoliu3RMNajgPNR2DCOoMp84TH6OK9vdxmbfWUXe+jB69PFSEfwXo2lN9uegj8eSkaAQw5fk8/p1m/QXmAKgijzsYqN07iTP/nkLEPBn20Kl+GqFaMIOOm/HMj6+S7wQsO2WHS8q/DCppKXyehbXDEUIWi8+7DCbh7tPJBCs3jC+raUUL1NzOFhmfQ1KLcAnpnLydZn3F6sfVtZ0h4SeyT+youpYVFur+LwUnCP312Oz0Asw/NZAL9ogElrAYXZoI/W6vlV9q5r5ydmit+Z2IkbOcrO5rSKMHg0GOflDY4Sv31YTu64fpxF/VpT3hzv118+mmkMv7WL0tvj5pZ79UlUxNEbcpgAl0cjV3/sjv9wPfdwvCPazE6LD94Kde1+wNP6jQMMTkeb07yFWTmypLctNj3EhILSBSNmBFXAEhp8r80xlTPvFacffuXY3kOjPWkKEPTXsvexlYhdA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8cad8817-ff3c-4660-a757-08d9c4faba25 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2021 03:25:39.5408 (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: AM6PR03MB4104 Subject: [FFmpeg-devel] [PATCH 12/14] avcodec/mjpegenc_common: Use AVCodecContext.codec_id directly 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: dItEY4DUCdfu Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index ecc21da1b8..e385ea20ed 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -188,7 +188,7 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p) void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int vsample[4]) { - if (avctx->codec->id == AV_CODEC_ID_LJPEG && + if (avctx->codec_id == AV_CODEC_ID_LJPEG && ( avctx->pix_fmt == AV_PIX_FMT_BGR0 || avctx->pix_fmt == AV_PIX_FMT_BGRA || avctx->pix_fmt == AV_PIX_FMT_BGR24)) {