From patchwork Fri Jun 30 21:33:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42358 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp2814755pzh; Fri, 30 Jun 2023 14:33:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlGPv6q4+oMSMY0jsg0A6AVPrqG2sJaBkSxOAbfD6Y1yHE0+L0Uxp6GKCGsR4EGKUtt1Ddh6 X-Received: by 2002:aa7:c447:0:b0:51d:8a55:6c11 with SMTP id n7-20020aa7c447000000b0051d8a556c11mr2588179edr.8.1688160787050; Fri, 30 Jun 2023 14:33:07 -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 u7-20020aa7d887000000b0051da21c943bsi5952411edq.169.2023.06.30.14.33.06; Fri, 30 Jun 2023 14:33:07 -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=oahdnwzI; 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 65D8768C48A; Sat, 1 Jul 2023 00:33:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2042.outbound.protection.outlook.com [40.92.74.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22AFE68BF8D for ; Sat, 1 Jul 2023 00:32:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LtvNfYOcz985YuatWKB3l/JaLcbtSPKnLtl7zyB/gl8XJtSR/NyY1YzYmUgmXHVuY2kGsvZ4ahYXjV/dOrb43cOodg4SzpY4lSnoaCP3UrTHV7yj5Rl6ocunIH2AoNUBO7jnf7ZZyEBlnIiY/59A1F2lPy4J8uAif7y7jhM5kLLTYK1CrUTY4+lDtM0zxORGWGZRV2caoJegBq/trCEIViC1rgEeXIVYFoCEbzkFH/ENT6SNnuyoQs3yD9VTK/EaoXkFnlQgKnaHsRd10Hk8OFHa5uAlliSsfqPXP9m0UmhivBBtZtJLK0suu+a1CrnoPM69I6xX4GkHimT/JSt7VQ== 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=tDqGJzajU8U0JEUO6a2pHbK7e/Qk0qYQJZ5SQICo1o8=; b=BXQ7ro845bj47byS7opUVSaciTbmC0moPjHEfWFRFNTTA15q7fFsLFoDP9r+06SPDZ10ojH0RbefxzQgdGnynfy66KcEYT9Cg8Qzp5LiQdMkjjUSYw+tp0QIuXTw1AUkdDpFqSnPp7lGArmMpRXa5Si0BICMejth/Q9CajnsICLxtfv7Wk5UqeeSCJPb/zgyJQZEmXZEBGhigXZLXp/Gu3Jw7i7RXXiD2HXbjZUoAxlZXArw37SXeU+myICopxZ2eFflgy3x+ITgsVm1cy+E29Tr9dOadH4aEuz5x9fNfR8PWFgwdCwmZ/yfLbQH2MR+b7WNDfJRbY11kd5w4Hgv9A== 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=tDqGJzajU8U0JEUO6a2pHbK7e/Qk0qYQJZ5SQICo1o8=; b=oahdnwzIplbDn/p0JlfX+8rXTgbFJ/SV4l9ZQW9oZ5Zu9Fk3fHfV1h9o6SfxWKRgjd8fgLHOmVKO4RjLKeK/E7s55myYzqfBb/H36Sm+rLNolgAsoWlHgx6Fh398LrhiSwFqY22TVu4LC4ZqUEvZsmn3qu6+llC+59swZZGCYEvXBrAL27bbxiGK6YS/XCKDJsdh2eXxGxOi2qW/jkbQJIWkyaAUCzn9Hj4GbRvIfNrcXqtHOSg8syoVQhiz8xk05YcA9nHih+QBf8AYh4GsIdDD8KNH5gM1ybwed4PVGq9dTQRTTpcyocPgtWU4feVWZ0jlTd6ucrt+KHtW8cZxWw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0059.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3da::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Fri, 30 Jun 2023 21:32:55 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907%5]) with mapi id 15.20.6544.019; Fri, 30 Jun 2023 21:32:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Jun 2023 23:33:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [808685dCOFGfWgm8CVNTrx3rn1v3Yzu/] X-ClientProxiedBy: FR3P281CA0041.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230630213356.1433538-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0059:EE_ X-MS-Office365-Filtering-Correlation-Id: f0e163af-ad3f-4e1b-8248-08db79b19133 X-MS-Exchange-SLBlob-MailProps: znQPCv1HvwWD+ideu9kbumXbP4FzeJRZ0hqHvh8sQumoY40I+KeGdvoAq8mY4IG8u8cv5tKf1ssTR8OJtPkSls8k44VhyaZt2opj+dj1jE1ZeIZOcLHcT2VjW7k5sRRFPNzJk28ZjG/2ili0GB29kBEDewaBsSHtz/0mWYXxTffHh8P7HQjKZkK4eDqqwi3clL1u9L1gnvrv8czVOhjQUxZqY+gI1CihDxzmzsb6Z5IgpiazZlD3J0uNzeTAz9k5uiyjUyXftEk0DJVqdabsw9LIxAJOsqrAAeBQzbVJGkGb0n38vHylqHpAUSg8zJ9WOXSPvCb4Wtj6+afICOtCq8KfxaLTyoWx4POnM6H0m4MT3+HdMCfxBRW4/4MOditPq5tv0r16TKF9g5zKisqny2NLS4sxxMY0TiyO35aFBm/W5DBKHsz9XP6Xx634gMYs2Kh4k/025me/v/8Np9AIDBN0j50XTt1AEDJKmYr4e8ZHsrlkCrLVt/jYsizvvyZCrDnmT3gi0OosH9J8ZgPNJtwNfXY20qE13z+r2XRoIu2+PoX59s/ZbZcczRKxFE4ai3gqaIxXOqP/lxo2YKtwZvnQz431WuBCrDV4b/70Y1K6MLHqcJdi7k5Q1DQZ2CecQkAclc4A/SmT4yPvEaeX0l0BFAIYt0Wlu3jtMzYqXvRwDz4k29WIk8dyCUeCQt+l81pKHoMpRUI7HCRLNV4tHz2rqUMsX0Pj+9gzkaV4Y70gaKxY7Cu5dS+tdYP2eLThxSMX9E1+J6k= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ilm7/Csd1DXHVzNCvu0t8N5AXkI1MKDWY3V5e7Hqi508CG0sf8jwK42HiY1xWRgCTm2qc+Ni9MRwa1H2D9vGMyEgBcmKj612hu0V1U+KrBBp8TPU2PbJcNOcFHp4QY0wpkmsVQDyjxa/nehPSOIfOOWW8pNm8tmP1l6JlnaQ8YM1ITb3oosIN7f4YPPa7/Kh8Al6y7GUvV5hL4sZ3LxIPVSbKJo7YLthGiUbX9jc2tr7IR/wiqDv/oR588iPIDpRuCNKDeTDpCssQsbV+5zJMdxftFeCsw5m1CN3SjIIKr4478g8wE1M1Xnn0d72ntDAilpE+RPV1N+qu1TsnN6nGmgiSobz+zT2vMAqx9/h2EWSquYHL5qP1pwrhctr6iggdpCIXlODP9mTTVtHkZvfEgnxHtccKkupe84JwsK4Ym+K82pKW2HBnhb7jgHqkWQ82fmeXdk1oLGm2+CDxgTS217j9bqwJEubw3e3pGZVnnzZ99agZHC5hPL54hHCgufPFmsv/KSvRkgFHH0SmDutYEVajU3ykm8S7l5+8o/yK1OWQ6zk66CEfmWaFcYNogX0C4c0kC679hHqSOOPoeuqjIUX10CgDFEJvHci/Yx6wDY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IcEaMhhDbzva1AkKJG+Mab3xKdRRQJfxNJlmMaIFimahBL05FGeQVrZfsd300qCYPTrwFFYcqEZ0Jq3OGy9FQQEehXSgWOsdpAJlN+Cpiq+73MxLrzOWQBQeKiUP3DJh3fMRFkjE+kUQyg6VItME0zSWGfWLIr0QZMp8LNL7zI+DTGA62Me+DHUShiBFFkZ4nFbrqbfpfpPxv+KGaVuDuioHuzgX/ynBVppct1IC6ZVFVSTz+O2LDDOqoJ9wxScxBib4mr85ar8aw+jJs4MIFYQVJjPEgXQfYFl468yQgQB5Qc3eXuGz6NYgbHaB7VOfZcgSrR2w+Zg4CPPdY4KJ0u6KK2tIfbqIpEimCIkPiyyAMEVCyH4dv6VXXHk7onjsi/D8qPnuYfBVBrvu4BGBSDF+QBE0jCut/V7PdWo2VdELXNoDf1E4xKGmFDy2wlciYGc2UFq1QFXfs48Dh4yPo9o/vFTAjIZLj+IM+7kSV9l2YZOpT5XRBpW4oUB/vAYp2AMn4WYOo3ijDpBrz3Ehw0QEIbCWJN7waqCih7+up0OEnC4AfNrDU+u0prxX7A5Za4rhSsF80Smr56kVlacYKFEGgRiSr8Xk5O2sEOOnCticXobGnAGY5cKLU8t9W0ruDpPD82YAW/2SMsSFzStA3gy4dKM2WktIgK0ij6I/eu8F4D84aoq2IN2Ilu83EXubkBtYJKU07iz7dSo44DgH90QhMdFx3gPb724bOtwKt66o/8qFE22FIpXV0u2mkr/tMMceSOC05auJVxrYZwy6XbVvOvvY6HL4stw6hsxxEUxrfHy7rV91v7R0CLbuGMVCTEZlWFMqOe9ZrXjRIlcSgT+6XKNchzhlDReCBoghub3xooWIzTBy/T8nd7tPssZ+ENArV70Q7U2mwqnhej1X6/a6MUyo1T31qnDgEpqS5mf9XW47+ai9fFr1P81IjxydWBMRcrNaqwI3JqGB5c5fxXVMuCt1tReNsccbpTBcvvZM1cLVzA2ZtuefqOd1K3MgNoSAmReOGNCMapkYyEIbPmhKMnKCX22momqisg71XN3XLAHs1hVQDjH+rw0FwDncmPaCF5Zh+8ZBA9NznsScPtYXuM8BNCqLf6PSAPwObZVFGRS9LQ5ib3vxIhOnGeuBeaBC/CPrb1GTGjNPFSks1ko9BakQjm6sQvClf4xa4FRhQF7uFMEKujsrjNv4Ro0QuYgTxk2vmoVYdvMW0WUplGNbEOL471b6h0FjxS0XYE2r4N35kv10ECMZKXGZkTUK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0e163af-ad3f-4e1b-8248-08db79b19133 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 21:32:55.8024 (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: AM8P250MB0059 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/cbs_h266_syntax_template: Remove set-but-unused variable 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: AQMp8KkgxVl8 Reported by Clang. Signed-off-by: Andreas Rheinhardt --- Maybe this was meant to be used? libavcodec/cbs_h266_syntax_template.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 56e1205337..a329b7f9ed 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1711,7 +1711,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, pic_height_in_ctbs_y = AV_CEIL_RSHIFT( current->pps_pic_height_in_luma_samples,(sps->sps_log2_ctu_size_minus5 + 5)); if (!current->pps_no_pic_partition_flag) { - unsigned int exp_tile_width = 0, exp_tile_height = 0; + unsigned int exp_tile_width = 0; unsigned int unified_size, remaining_size; u(2, pps_log2_ctu_size_minus5, @@ -1729,7 +1729,6 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, for (i = 0; i <= current->pps_num_exp_tile_rows_minus1; i++) { ues(pps_tile_row_height_minus1[i], 0, pic_height_in_ctbs_y - 1, 1, i); - exp_tile_height += current->pps_tile_row_height_minus1[i] + 1; } remaining_size = pic_width_in_ctbs_y;