From patchwork Wed Dec 22 03:25:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32826 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6022759iog; Tue, 21 Dec 2021 19:26:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBl8CSJs9apCqSwSgAFv887OTAWnyz9THZ33CbhDmK8JUGenrsdnPyWA0epUOFb7fwii6Z X-Received: by 2002:a17:906:58c8:: with SMTP id e8mr925072ejs.380.1640143606412; Tue, 21 Dec 2021 19:26:46 -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 hc12si351129ejc.752.2021.12.21.19.26.45; Tue, 21 Dec 2021 19:26:46 -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=JCWhzYSi; 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 1AB4468AFEB; Wed, 22 Dec 2021 05:25:49 +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 7AC2468AF8F for ; Wed, 22 Dec 2021 05:25:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WZb5EXd1+q7i2gww2KwHoqkutYd9eIaDFhpvwfWckfOnV5R2b4Pi1oKcJSjeyMVLEamV9ISqeR0DqgzOZLxZH1iKYb5XdLCbqAd5EkjSfjT5FY3yCUxGjCTv2bsCmDOGyUtC1MW9707wKrniuLaSETtkmhsoE+4cPF1BKcptyLF17L/DsWrqq/RiAowoM52V1XfBXa1lxc1qby5id6IgkPqi6yk9id1BdRZxGVPLd2OHUI5jtgjLPOcD7rF7rrREwEsXhigJMkMxUwybDadRtYf/VpN3l3c6PXHHoB96KrmQx1FJeTrWK0kJa0b9F9NmKmhjPo1xrzG7P7q+cEqhPw== 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=kThIXcxjc92w7OfEilHTo7Mu4kg0fEzGnc4rDhUBtqw=; b=ngZVCqq1tUvpZmPY5Jf2yTTU1cVgvXY7VqF/9nS4W4ZiO+Ss8samVdHIlO77XchPife/A9b5i2qo+QQYMg22rTA1e5aCA+fXw7il6vwzzxPNFmxaRLEWvLKTD8KarjKuGyRVuqGZMJ4+bmDT9wtgZYXFZJe67BpLhlmEDkejxm/X8Bauh1iOXQqktU9DC4HU1uRFrzehoChS98grhAdfKsNL7p3yYWSYCfvcoJNAHL2Y7RqYbCbLoC7UnheO7gxiG59I57vpUS3FSG7xDcpwhvL0oTcyjp9G0wh+7avSJq4IRHKiHo0VIXhm4k+SnO2ODANWtZ68/3e6/AR9as2Nfg== 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=kThIXcxjc92w7OfEilHTo7Mu4kg0fEzGnc4rDhUBtqw=; b=JCWhzYSiHJR9S55qfBJFytRKo0Af5X1DeAkfI250N3DgXEOjFdztpb4L+Dx2u9KDEl0zktQ0we3cNiraDcShm8M2xrv+zAUQiM0brHnhYtuJr1/WFx+99GV/GXJxU5O7h2aYXBJ7TdJm6SRRRS1qsmRS49Ks4y1TcM5q8OXhXLAh7+hnXAJBQz06QiqkQkc56M4nTHvFq+oQ/DZB5ztnyirglB/ElyY2TZQ4NQ0+ABl8yZ0ILU/hINSYd8Y8DQ0yJKE8tQFvF17nw0wl8rKpXBvK//Hfu3TaQ9h0EXr01JvPlNZJBEsFCwZy4hkMX/47xISgwt9IC+jxnxtr08ROCw== 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:29 +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:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Dec 2021 04:25:07 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [CdolwQH2dTw2Jvs8w7baaUSHQrs8s7zN] 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-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fdbef2f9-06a5-4db2-9e81-08d9c4fab431 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlqSqCEOGjxYs2dv6cHo7oxvRk+X3ZPAvwzUw2Fombi01g/PpWTskFEg4VkycEwLpXQyJcgeBOEaA+oSBGnUHgBhMNj9hmzCz9TqK0jWSN2kBxsqW18p/0BxNYLE6+mxMYKeOBmCPVJeFMDSqF/Kn0lSKfyebqCNXUvkrJKby2spAQABeqxk0cd9PDV6S6l2PIUlU91NT1ycqdut/rULeIV5A1srnQ3616KEjV85XT90kmYbEnQXu10psnDswvqVb3hWxohTTJ4bN1e6YS+fHKI428CduLFHZ60LA846vad6ZnKH9NP630qo3jYqO115ToJLSQpNlb+O+J8COFzTKK9o4QWNsjMlPAu/9KWk+ZxpyvKonVivk8at/UDUlALwjZbXwktEZuMCxwzZ6ojjjfjZ3LB04W0e2quHKbiRHY+ARK1/XTWLpWtBC+RSsLUFSO1kExf62VOASA/WLIaWrIAHTQUJFQN52X6+AWCDOpDX1LFCxrsNh0uy+5kY62IJ3YugWKnRMcPQTzIbyGae0TIDn+2olHAFoHz9/A8A4A4Yffv7S/yW4bO9wxjfV0Fp0UYcxw2oTHKUKcHk9mcOP3SoHUMYL+kSRuBipY/ih6Zf2A5c25WRG2URU1IqgpK1ziRxjn7jWsltR+zLYHGucsSHArxao3JmdQvXrgBQMxFzOLLxvVMK4rJtu9o0u4AQhfTzSIUT37mFM= X-MS-TrafficTypeDiagnostic: AM6PR03MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UyEdEILIXL0D9C0GABu1Nxq6eE9swA6LRt3lsB7Tt8hlcj5U1WsV/G+0Dh7z2jgPN95H64eo3GkRh7lxq9zgi4EsladDTyT7Nrf79Emi+cMUdNHdaeBil7Y1x6aF0zSnQpGNtdZgJfIDCRTqXGvDoAdd+el2t48HekwuXpX8u56Fl6uys/wCMUpyVuLd9QEHfJ2k4PSC4djCcFWmj5TjQuJjHUsmrU81whVSUKaT6OUeP1SuCZYfwertzgfDWo6ojz4LHH0+Q/wLLa44Doc6/MwcSpuhigtHNLHQ9QSKHO0pEYWR9od9/vZe1buprqHNk5ZTjBhzbROBAipHzPEg05RXI1e2eay88iEd23XpLqZZqfSJ97obDBUommX0c7ICywkdANhqsY6iB97WhWuR+KHSLjJ9PCwhqLntzEy5gN04xzAmwryuRqD3XRd0nRHgDFT/d59SMhBgHRVTEZfJaXmOIPROSn7a812UsL7tKfva2QKWXSkO7IO8APrPyOKiQ4+0fle9ACnBj1nvhSF9ZZuLp0ZEqrSY3He9rdiF9HZYkeOxuG8wzuNv++FU9lek9G7w9efQUYTYC1EqwOWAwg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uTPy6hMTCO4rr/HEcFnFzc2bSYb6euLdUe1JA/YgeR0s3SlMEHvAdvL+AmcQYtzHZOE9071m/SyLOYDN3ipL2VZ31OqBRYJ3n6kMLCbtwUJ2udkpTo6SfayUgeXi8t5W7GQvE81HxPOFevSn/MMzkmkMgKq0xFVeAvwK5bDgQtWRXeuw5NN6cMEd7+wxFKCIaLrHgnb88Ep4RlkIaASiTdBKw6SCspTvjRMi5p4Bq/hvEDuyKOfjYdRyQjuSywpnEjXbfEOU7q58QRzageke53hQo9UsfWE3RT5/ea9g33Hzhv+MoHGFQ3nB3Yjr1xHhItwvjnXueAn6wUzOxBCoaJqHH8FVi07ql7hbQjVZfP/bbrpxDg7MIyo30knq9V8/cOCM2Acf6kkL764xDntTuBu/+Q1ao0u8LDLaBmD8h9vu9ydO3s7GYcXRMiJvkFUjouDJ07NhqfPaTkou/7p42sXqIQ2Pe68tPKWR8HVZNt4/ugnMXh0a9byfVgsG5reyIqh3jiESLcImfQHe1iBEcvU9tHad0BeKAwQGwbGztw2fU2MPGGEcm+ElyHdRqiPEeMlwW8GuK6hfaOf//MaQoJFbQYBA3kT3srFwRKaTk7RiYPe6nZ5RqfeUB7Rkx6pxsM4N73evka3PYYgMdRoZbrjTWy0zoyfcIEFCDW7lD3F/5N9T6CbwBE7DsI4i3+mvY+0pYnantf01kObmXkBsMKKXJvHJPg5EjvjIs+HgeljBCofCWoZzqxBJBniyhIBC/ss47fKGiD8HWVsAHwiSJVLkrUSiQiL2xz4qJjzapqwIOrHtcl5VZbgJSpyEiejWQPjkq4poLCvU0D3o9w93MFkWB194nF36q2fG9qpSLzz/923mgoTvzvnCVRLMiMq78Jtb9h9G387lIwwrIB/yxg+XK3dYMTml5zMPdkb1tAvj35cInp6NIxD+qKQHCfAXT5nILQ3mXtJA/Xeuf+BiYA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdbef2f9-06a5-4db2-9e81-08d9c4fab431 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:29.5998 (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 07/14] avcodec/mjpegenc_common: Fix intendation 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: Qxbaw2e8V6eP Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc_common.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 8046e4b8f7..b9df32ad15 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -73,17 +73,17 @@ static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p, int matrix_count = 1 + !!memcmp(luma_intra_matrix, chroma_intra_matrix, sizeof(luma_intra_matrix[0]) * 64); - if (s && s->force_duplicated_matrix) - matrix_count = 2; - /* quant matrixes */ - put_marker(p, DQT); - put_bits(p, 16, 2 + matrix_count * (1 + 64)); - put_bits(p, 4, 0); /* 8 bit precision */ - put_bits(p, 4, 0); /* table 0 */ - for(i=0;i<64;i++) { - j = intra_scantable->permutated[i]; - put_bits(p, 8, luma_intra_matrix[j]); - } + if (s && s->force_duplicated_matrix) + matrix_count = 2; + /* quant matrixes */ + put_marker(p, DQT); + put_bits(p, 16, 2 + matrix_count * (1 + 64)); + put_bits(p, 4, 0); /* 8 bit precision */ + put_bits(p, 4, 0); /* table 0 */ + for (int i = 0; i < 64; i++) { + uint8_t j = intra_scantable->permutated[i]; + put_bits(p, 8, luma_intra_matrix[j]); + } if (matrix_count > 1) { put_bits(p, 4, 0); /* 8 bit precision */