From patchwork Mon Feb 19 12:33:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46365 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1225332pzb; Mon, 19 Feb 2024 04:32:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW36JbMe5yEx6ojwyGX3gHFJWaXoDnWMOIE0gc3AQ2SVYREhONMXPYm1y44qaJ32N9QKfzecnUggBFok8Ysb244KZOS8DC5I0LbPg== X-Google-Smtp-Source: AGHT+IGIArzOmppg3pefXHG2qp0Wimggz2IARR9SHpqZal9PqJf2a1vLDWdP4iZ7gA1q01p05863 X-Received: by 2002:a05:6402:1a50:b0:564:8adf:9a7f with SMTP id bf16-20020a0564021a5000b005648adf9a7fmr1125557edb.17.1708345931846; Mon, 19 Feb 2024 04:32:11 -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 z16-20020aa7cf90000000b00564ac44a49fsi22012edx.385.2024.02.19.04.32.06; Mon, 19 Feb 2024 04:32:11 -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=OZIhRSig; 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 93FAD68D225; Mon, 19 Feb 2024 14:32:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2093.outbound.protection.outlook.com [40.92.89.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2814368D225 for ; Mon, 19 Feb 2024 14:31:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=in5UWyyALFKF4RI6CbEU7GD5S1LSjwOe464+x+eE0efpVDRaYrBWYSejxEa/mEZUPOAtbm/8WLSeON8BH3/6JZy4x0FLSRStr0xEypsiPGiOvJZ6XQv6vuT8Qvn6sUMmGhFDBr1bg7kglZOVM4zCa5Qt0R6DqL28dLHglzX8U3fYI8WUY5Sz+KS6awOgn0r802/4BJL+zmPHQCFrkQ3ZE7s7NzBF9P6lcMOQfe2fzSTVjynFAFkjI4Ck9MANuC7A5Pls6miFEx8eQ4WBroxR6eCRx3pa8OvPppXwMZS202eo/T7qpkV36drJTXcR16PGONsVzIwAf8dEfFoaTKrmcg== 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=ensDKdSN9cn23jCMJJXvxWS1oBuJWL2f5D8bIIYXuHg=; b=NB6umdazAzIW7LglMckMiBornDJpyFY9/QQoXyaLrRdZ6G3r98TTuE+682gPx6HzTn5Gtp+DKes/s9rENAi3qR/11oG/yvRdcJW1Z90Hrvevd3Xrso3BY3anoZHST4yTSQBGxJfa1YhqyW3QqCYRza51Jel/zd1l8qz4qFlCHnhPeelLgdVjstIlvzc6bK8tOmeWPrgJsmPktz2d7KfYAYtP1+aX+KmTUDrAJD49ktl3J7sHc2fAXxLQAb3sENAfUk5aFTtthYMnp6K1pEdl/620zTFILai29A61SONSijfUg4nhisEwVFM7dQ/tROZ42flmkRdShyHkpjxcyaHvHA== 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=ensDKdSN9cn23jCMJJXvxWS1oBuJWL2f5D8bIIYXuHg=; b=OZIhRSigsr+/byVEFDWQYwdzBtoM6SLM6HKQkW7G1DAZcMWbrTWKHRLIoeVng2iwCxTCQ+8W62/07eo2DDOAIfrd/YwYmHkRGcxItUNr4gm4yzHWM4TRDdpJVXUCwk+a/OALqUtoqVzXcGiuYxdfE3NIR2A1a3DLg0sps2BshZFVO5OAhrJyL/9/3nm9jrzAolqPuFTVgbF/T/xwN+AuPhPTKgOIGsd+BxZ1tPouNUszbBDiF9k4HkE2FJqttis0aUJJ9SeRO6pQBfHNMRUQWJKotWoztN+vzIIU6SujCxhICBWCBlluNRKDR0TdFrkd6Uem9jWJinhdYwf04LWMwA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Mon, 19 Feb 2024 12:31:54 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Mon, 19 Feb 2024 12:31:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Feb 2024 13:33:43 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [HnIbj6nkuV6pq0dvcxFG/geNuXENkvbHk1A8S1SV5oE=] X-ClientProxiedBy: FR0P281CA0009.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240219123344.529789-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a57e317-246f-4085-ea89-08dc3146c118 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mY0c49ABP/9TnhvXAXvmhrBo3FEr3vCB0ZEF8NAh/2BDpaG2+CqQ/C8Rffdj2fA+YM+oRL11verwGTdwIPcYc46jtKw9xJDluKDj8yz1AgQ+VdKOhG8ILb8ChMAS4eJcjoFuUn0OUjNeXRYUN6U7+O36J/wtphQcUfnk8emP9yCiiaKhoG+rCTMpj+eIbFG11YWDB/FIQug/j4+n4Pjie8MvwUqQUNpS6I7/04NgZlPxSeUqv7BaMLIUnK2PSK2/P5jnyRmF6PNgn00kY2O4UPnm0U8RSqP5hi9Pnof/HJf/urJQvntRaS3spf2XJgxnx1HkmaEyqVeo4VgbLJNtIb1Ti7AB2P3J/T1HmMumHWaqU9BhOTJXLT3agZhv6ffynw6H2yA6BqyHsy/jYlgJSyFEiVNFJavzJZERZnIYynTXvs55oUPBC+G7OB2OCzEyq53M+bB1mM/69J6sXhX/DN67EUDvoAv3+bxZFIdKdC4k67tOybC/Nm22LQHwSeLG3TOLOPLhW6OIWPu4WpGi+/SmGl2QCK3q1Cuh+D+IO8SWBn8JUnrXt5maFyqlodIo0hpPsckH/KLhDycjtcCm9IGsfhhmFTZaqvdKwVFK/xvQMVUFvay60mnl8erW+Gz3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k2RRPiDuzKmnnE9Gqp62cf1feHuQ/A6F8t+s/5E/U2DWm4+RnOiClwg8QddEJAi7AISz0k0qr03ei+wznqcTeyPttey1D0pIkUtMVe4d33GokE6YdtJXFxqPg9T6sNDT1zc+P1STbi7pGBNIAzlDsBHzyF6K7T045vQE9VKRsDkzAamKWsCPY8BHR0QgIrbGFJhzpwk5XEf2I8Q7ah9eA/ojMIOkzUjXnpRdYyq9fIU+LvcCO32Jl/apF+P4hRsxs9f2exmfuOXJzd8fs0hU/Hz1hVk8SVh8RPPDM9TydTfiZsrXOsliit/2ke91zLK60jOnmg4f8mLbGIGgfSLRwaoeAgp+i2kJpuIhqKzMMVh5yi271Bbbfo/Ss577QXoFX4OLmnOkiu0zPE04O+e79WptBWBNzLRvsUgVs6dNwE3UckO1ClFTFSPXBZCeHVCADg5MO+6eKRZYtsLxI626nmGoXaNPNZ8t0h08Z/vL/JYkSptnOraDGlU60nyUpdqo43Xrelhu3paWu8OpHCUfJQque3/cDV8V0LUh7b0sITsG0E3vIdqLnUyg3Cwf5OLxodZNnRLhV9zRDI+A1wBbfn8XPTnrAAEvTPA8a9kL+cnkjs9Mh1FEF1Mr8DUPmLLPjI3iuP1rtQo/EQDlqAT6xmfIHveud0dvkYkpwl0rzdG9n9svCp94/38UN4+9plk3c86Aou6LG7iSikzwU4vvGR4TDH0udDa3Aa5qLc3YFzhYyN3M96BOGHKLtI2oGqRO2E9YLOmqDhrAgJBlgZkdSzvPy5uie2warvyY0ot3LRxLgG81OSIcbhb5XSC3M+eGImdG0aJ9D8Uz2GsCC+jUG8rsgDo7f6vyZj77istJXx/sPVE3psMsONJqD43k9LCzFn+xwE5SyfoyhP1TGS3ZAlnxLxJCkuLctd3vMUbR/d7hJGJvNzKCQqIXrxUfsQSxPtxpd4gyrq+9BTTohhotxrmzozWiVzQR427thpNOS1P0TsGeGmtdpyY/chwFTXeflQjGt5YAWx0QZ18ihPHeeTF4aS66iLfFEYybj1wyMs37z+yBMbk38dbHV1jY38Kn2u/GJ0PHg14Tasjn8j64giZGuSC7iYzbyLFwxe7h5XChIlezf2QPB0MpMnMhyo7mLl1acOEo3p0pEZzr0y2Url1EJ6FoEdn0wlJKG8rDo8PiIoxALDgmWoLBaEJkLNPOO9jFMjrMWVMP02e2ShU/5EDKmytqo0neA1Gp5cMFHo9CYJy41aV3rubYVRiVj//fn/VY1Ag+nlbCzdN5jgYpxA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a57e317-246f-4085-ea89-08dc3146c118 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2024 12:31:53.9168 (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: DU2P250MB0148 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/h264dec: Return early in ff_h264_draw_horiz_band() 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: /pZrehZBhYDP Signed-off-by: Andreas Rheinhardt --- libavcodec/h264dec.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 9f5893c512..5cffeafc6b 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -104,9 +104,17 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, { AVCodecContext *avctx = h->avctx; const AVFrame *src = h->cur_pic.f; - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); - int vshift = desc->log2_chroma_h; + const AVPixFmtDescriptor *desc; + int offset[AV_NUM_DATA_POINTERS]; + int vshift; const int field_pic = h->picture_structure != PICT_FRAME; + + if (!avctx->draw_horiz_band) + return; + + if (field_pic && h->first_field && !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) + return; + if (field_pic) { height <<= 1; y <<= 1; @@ -114,24 +122,19 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, height = FFMIN(height, avctx->height - y); - if (field_pic && h->first_field && !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) - return; - - if (avctx->draw_horiz_band) { - int offset[AV_NUM_DATA_POINTERS]; - int i; + desc = av_pix_fmt_desc_get(avctx->pix_fmt); + vshift = desc->log2_chroma_h; offset[0] = y * src->linesize[0]; offset[1] = offset[2] = (y >> vshift) * src->linesize[1]; - for (i = 3; i < AV_NUM_DATA_POINTERS; i++) + for (int i = 3; i < AV_NUM_DATA_POINTERS; i++) offset[i] = 0; emms_c(); avctx->draw_horiz_band(avctx, src, offset, y, h->picture_structure, height); - } } void ff_h264_free_tables(H264Context *h) From patchwork Mon Feb 19 12:34:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1225553pzb; Mon, 19 Feb 2024 04:32:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXxFz3N2hmtbIHDrtB/42ZZto2TQIThMzUSW/7rqy88CW9PRZ6bG2Yu2yFkWtsctCRm2RBNYdIeSmBDiC2tpbjy2OqgkLbIMJf+dA== X-Google-Smtp-Source: AGHT+IH/JVtqC4xr8W4NkSF6CEWSJnPjGLFXuRa0s82Ffk88vq+9OwJLtd67Lpv5Xk1aZnO89/Tl X-Received: by 2002:a17:906:388b:b0:a3e:dac1:bd4b with SMTP id q11-20020a170906388b00b00a3edac1bd4bmr176201ejd.27.1708345958196; Mon, 19 Feb 2024 04:32:38 -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 au16-20020a170907093000b00a3e21afe9e4si2146546ejc.325.2024.02.19.04.32.37; Mon, 19 Feb 2024 04:32:38 -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=PqAmEopl; 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 CB1D068D409; Mon, 19 Feb 2024 14:32:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2039.outbound.protection.outlook.com [40.92.89.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE2CE68D1B0 for ; Mon, 19 Feb 2024 14:32:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IIXC3topohZ3bhiG+/IM/TmEXZmpcKyfHnqFI3JQWBT7TLBP3QO78vXnk8mMga9HHHHWdiYxBqeWAN13itKUpZWlZN8VUIrv8aXmry6Hx2CQ1CSI3qm9jgYManu1xIKF6z57Pne/j0rstsUDeogQ7WEVCbAW7nAtHVe0O2TwkDuV0jLkw6dIs9BiTrulqcIEJPejsTBEs+0q5t7SlIsZDkSAU8TTTXjCK3gRT8Z0P1IVdEaP8oH2OYgYd+B0gERPnyGsat1cCcNz7LDYQJSEObqwgxX50W+86hdqHQgLHk5gSpskcp5IqKGi1seSMIMcl5AUpz7tczKTe9fiTcbZYQ== 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=mnZOZQIG2NoEqF2dom4kP11K7YLUJZfwyKY3koc8Kyw=; b=CdFAPQarmpMvIg8k5WlthROVYOpuMjbzCt9WQyGcBciHy9UMqEM0ZtXX5i+KKX44tz9sGFPGiz7wpV89KvFtiFcXCJUp97OapezplTdDnQQUVlYbGBbFpeBrF1U3b3uMkFf3Osh/GH48MR6lEaGd3rmmRKxh3HuqiLbP6sJCarwJzFgxWFrA6r0Y0OJ6y5qUG8stRSx8Obe4R/q7jvKHof0RDuW8uTdkxyxX4YdHXo3KolaV9EQVqGnmI0EBFVvR/74t+1mcahcxUhx4lVMJ/i4/Tr4/Mwbild3P+3LSo3nP2Ns1IH6tiA8ZUlmQscUCnJg64KKa+29hv+kI4g7iKg== 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=mnZOZQIG2NoEqF2dom4kP11K7YLUJZfwyKY3koc8Kyw=; b=PqAmEopleh26aOav3DE3N6EhZEMiUJiJXqGZEIJXPFSoB74vMB8RnaQbot1JlcaRNuMWSB691/tPhKvGOqfDH8IAxSHH/7BeqYE/GivMf2tbbSGs1J24FvOc+A12iCot9Ornjhk5I8yqJvwH8WINGmv1SyFhcoZTMQbPxsFT/tB/VlpcG3x6/j+Jv019x2Bru4vezAxBzKJvKeaXkYXhx15RyR4sRV6Ky0u3DGFLmcxgCzzKr8fRKBDiK7fIc86ZCEPwq9LBpPilMc8oKElBpZsoJErQWpVRvuSABhS6eunN+b6xVoHcKP1TCn4mCoaO2pFcncqmwVpy8MF1XOSQOg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Mon, 19 Feb 2024 12:32:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Mon, 19 Feb 2024 12:32:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Feb 2024 13:34:22 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [jBgaSX2nnpK0tFSr5xvbpJVa/1lAGPTfu0cTm5hd3q0=] X-ClientProxiedBy: ZR0P278CA0178.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240219123422.529831-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: 4391a121-ea72-425b-229c-08dc3146d7a8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: viGsv7UGoDOlyyICCwGiH+1XLsYmJgRMWx4Kg9xUkEKCyZqXArOTN+mcKnEiwRwsVDkkZZQPbFWMo44Q9ISPqU5Ji1w5Ashv4hFLqqbkiJtc8UmXAIPOlbFPE8kpi4E1movePW/l/s3wsCFgrHKWDSwEaokFa/bN1ojdNolOnAv3rochLF7aQkGJLQU7WX6LwDuI2W9JnnRWJS1QUX21juxfyiygPrEqu3XrJMDsr8VaBqnzllug25mKWbRtIN8Kgz5f7DlFCmPV58tlN/XUWjU2uUejUgnGic+6mi3bhRoMhz3gnxOs4Bm+40Wf/1xaATVqpZ7oKPqH6M/IRSMQ0fqeewIJASbH3DfpsGu79HqYNzF3b8Uk02qWmp7THOzvqsddYP0VWnk1ZG5rVPv5DF3C+sVKzVCtfeTSwX7nRkZCYh3tSfyy1tFiDDjNrkzN2ZagUz6Z7y0mwWt3v3D7DjhZlaroagRynAz42LHDiv6oobfqhEnIH7Cp3Fu9QFHeC0W7EGh9nab5ZS5mMlRBlLelLuwMFEZGm2UjwuCbvardRZnitVOX6RiVnlhh0Ln5lU5m1gCxZguhnIJSfU8ckWXPphJwxFhoQugJG5jK41C/jRdWDsYsva1SRvcObL+j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0FDKwB+rvKxQy+e6kOGQ2Urvgkhf1HCppB3r5vHAFlZv5VcXAGNK4ySm0/KEt0Kp1reXR536RL5Wci4N64x0UVzxp2YxgshMTsZh6ILcTZBZcfYUb5Lt8OHRdwQAApfYR3IjCickTHhh2QU/7LXSmRFo/pJRVJiD72RqzpPjIdlULe3r909NHaEuyUaEBQr2vFwbP65Lp09nctUKa+OQVDxdxBITfjhVGcAqiiTyBIUCFxQ6/L6yqjdsSqTAxmv463h4pToVSpYgOfSIikym3XQt6o10Nn9AO5mBUozQWbFBrpz6fnsueuYWgCwouMKiNsmLTgTJYX/YyKWopX06h9zOHoXVRCtibzMaurpv+ltIXTVHPpuBXUx2uH2nYxf7Q/y2K7Kv05yTU6BSicoxf2gON0KqnEyKNwBeHhF+mEf0jV3kNlI3DqSXZirxYg4khHyKTKBb1wZPDozHo951wHm7SgdMOIERfY1abxT6O/I4YMsaOmvRTUd283tRqQ/1pc4KnaaLFY1Fcr2P2lW3/dqx9RXYioKrSz1RJfE0wROEJB0CtzVEbxp9OS7DFq9WUue9dDbPJ6ZJE7XLFbatTLoRNYJ/LN7YUOmNaEEv/02wzMJSrjwM2F+MNdJZTWQ3mccsBkcpLPx5SWp5JDJrB0DdqlL/CmqZJIGoFyHulv8+ztrOfY1+OqKE5GaHHaYhUtJY9Wc2QHmV6O0EIAP+3pmILLw6mLUv8IrIktFhUEvYc5XuFRk2P/qZZ3IJBBDSxbGjDSCbMGWzewEc614RBqTBCloD2oDcu/Pf2InNT46oQOsqTm/W5WloPsuQhy4Hru8F3FPHLyH4YWoiPcmrQYEO50SLmm7ARouCHG5aOOh8U8QNL2TQnAi985/hC3+AojK1iVDIaaYjpWQTYwlrVO/2Ly3T23m03Tf20fADb1+7Gp2FQuGgHZZRg93mXHlP3jbKbw7R5HT5Kxi1APFpfSTZASoD0IrFkGFb1+noXqJRn03mmlPNCpYkLz13wYaxIr1XKonoJJPVeyh8WJ6AEg8lQz2+xXifSIuQ+mvGCwwB+Q27jXkhr/5QmS3ul/K4qlwYruj95MMlHuWNYKXjONNVeQbgb+f1i0m1bHge+cppVUQoGqZuOoS1flRWpEG9LLsRW7yDTeW5WNls6Cwnqycx0qcdNxYYw+TGWNU3AvQib4XDJtQUNGBi9ldRPZ80nn4Ub9gdw0lxO3bVJRC2rACaYAF8oNI6I0SysB2CdJseCHYpYx4V8xBxywN43NdQnyviQsiXh9GxkOZ97Y/lpw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4391a121-ea72-425b-229c-08dc3146d7a8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2024 12:32:31.8225 (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: DU2P250MB0148 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/h264dec: Reindent after the previous commit 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: mJQCcyHw6AyA Signed-off-by: Andreas Rheinhardt --- libavcodec/h264dec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 5cffeafc6b..b4973fce29 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -125,16 +125,16 @@ void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, desc = av_pix_fmt_desc_get(avctx->pix_fmt); vshift = desc->log2_chroma_h; - offset[0] = y * src->linesize[0]; - offset[1] = - offset[2] = (y >> vshift) * src->linesize[1]; - for (int i = 3; i < AV_NUM_DATA_POINTERS; i++) - offset[i] = 0; + offset[0] = y * src->linesize[0]; + offset[1] = + offset[2] = (y >> vshift) * src->linesize[1]; + for (int i = 3; i < AV_NUM_DATA_POINTERS; i++) + offset[i] = 0; - emms_c(); + emms_c(); - avctx->draw_horiz_band(avctx, src, offset, - y, h->picture_structure, height); + avctx->draw_horiz_band(avctx, src, offset, + y, h->picture_structure, height); } void ff_h264_free_tables(H264Context *h)