From patchwork Wed Mar 6 20:03:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46855 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp618037pzb; Wed, 6 Mar 2024 12:04:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWkXLdzKn6JFl2jFR6Zrk9UEvHRW3R1GOtbBmN+b88SK9iS2OX+Z8w1Imq2RiKJ4SWnz5phuY4g4iOnu9Kgvw+yH+s0RhDOryTo2g== X-Google-Smtp-Source: AGHT+IGKaVVcKDiGiKJmrQZzcaKiDO2EUAjfd9HCt1lEmZYpXpJ4etqKKGhpATQzyFS5BeiOpKBB X-Received: by 2002:a2e:a794:0:b0:2d2:d6e3:5191 with SMTP id c20-20020a2ea794000000b002d2d6e35191mr48710ljf.25.1709755459250; Wed, 06 Mar 2024 12:04:19 -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 v1-20020aa7d9c1000000b00564e0137b02si6266554eds.483.2024.03.06.12.04.18; Wed, 06 Mar 2024 12:04:19 -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=LMOuBqQW; 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 5923A68CCF9; Wed, 6 Mar 2024 22:04:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2100.outbound.protection.outlook.com [40.92.65.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF64468C5E6 for ; Wed, 6 Mar 2024 22:04:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n2UzB3faT73yOC4nMsef5nGnaCouX/IkcB4Y2UUyT4JAAO+tZj376KC9t5j16BUxhFH3WxRIbUBiY9G3SkL/kSHxzdp0scNsxh5mOWkzl+0v+1dbSTLRm8u8Mjofo0+tSAgEb6kSfrPy1BLzS7fuglEe9DjW92OKRCCQiE29WDdB7LtG05oRJDw8pk2E4smT1vKl1IrQ/6I1zl1K3YuUiwKvS+E4nAI35spOuogowBzF9mdl6M+IH4jI6ZkwqdgCGYEOBhac3m1T1FK7p98KmqBaejN8Xlt5nFFa6AhxBYtJ3GHmnkroDuAO/p+xTG0G4pc4ZuBzMsfzZmVuViE/yA== 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=7X6KylG+2dAGmyJotuLT4+JF2nYL9t6W8ajFKFmRy+o=; b=jXw2dpCwDrybyI31CMnUfmUtYy4nWB9YmufiM8sHUudFAlt9ukJ4EYGFajex4fBcSFRwIFi28RUE3M4SruhN1ZMddQ/r0cqMFvwxeYPcFf73ABsxfyOdFbnUAbbsK16IJkRkBZTf0hPo80MXXGkBTMdgvl4Uy8Gn7iujlzVvQmirUVEVa93LpbgHc0zQ9dGrKYDb68G6DoWqsHbCazzCju7TXZ7PawA0F0VOCuRr7laA9OZ3hbslwl8SwVPzxI9UzRPUProu/P6M6QWS/a41awWzGo7K47JQDtGmhUxdBah5QHFRDvK68y+NppNoqP0Jfpg5HNTuvcpYx9xJJWrpsg== 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=7X6KylG+2dAGmyJotuLT4+JF2nYL9t6W8ajFKFmRy+o=; b=LMOuBqQW/9u1gK2Mw/s9MH+/Y6R83T5MZnWTCtSfre5yysM9+bh7Cb1902rBKMs3vOPmEn/u1bMsFwpSy0u3rzlwMdG7bY93KmqHiP1K3ppg24kDsFzHGbb65iXhBsZqVm6UQY415Nfw2FIf+ZA5WC2cy0TtYHu3r8Vd/5LihoE118zIdwvDCFxN6RHRrU6fJr6EXcuCub3QAuOJ6E8aEHuxMB4loLlAEAMA61Om8NxJQ9OM07fbXJ1z8bOlZJhjXcSOUSTr2Ej79FF/j66RO8fkeMqKF613suKONlN4PL6B6gpszkeplf7XpIfmDlPW1h4eX2kLgMeiwIMtRSGycg== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by DU2P250MB0141.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.34; Wed, 6 Mar 2024 20:04:05 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Wed, 6 Mar 2024 20:04:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2024 21:03:57 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [RSjRDdK9ovcFlmtxlkGFsGIHKDN5lP/MvJk//oGIjFU=] X-ClientProxiedBy: ZR2P278CA0012.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::15) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <20240306200357.3332281-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|DU2P250MB0141:EE_ X-MS-Office365-Filtering-Correlation-Id: 5cf68c8b-d575-434e-3641-08dc3e189329 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LSdNz6R1YLFBof/s30d1n5XNxoeh4xRpmkETpgUvBueLQJyfTczw010YC0QcDG7j4EDnASQURMhmC+RnBrNlwziT6vE9kVdoOb4Ym5g6UnROUWfM9ChN3+9UL08w07thayFmgOq+i/83k1RGVSLH+b4sd7VFjtFT4AzjWgtL4Nk/uTyYYSnC7CVnSV+X9ixOchhf4LnUmRK6K4tXDDeiT0q6u4XW4Evzhcq31rlzFRPUxJtrq51S76IFVKJn/n7MJ6UiQCuMTOK51frc05m2heomAGONXSaJsodo6S2B0lZ78np4QXGSvvpk3PWunAqQHW4Phpvf4tUB74gonYiHSmn5KIWYCTbZpQA8OOlFcV/NXQnxqQfFxBYAo7JUmWXnuC7ZfVOhPFXHmIwbdk887Jp8fYtbetImLuEwy0l/bqvjk4YdkxTQ8FrxuLFIBSWeyv6myqTzeS+Dc9h6aEFk55ZGwzHTnan6SqKiy5wj+PpCNhYEBHMvPCKbL8SBsTnEznF1YiwtvBRp1f6fJSXcR6nLkpsMHwbCwV5eDwgDO7P1WtvGCVWxgAGGpCNPTk61Gvn5rWZqMt/9wW/YVYpAJyOu0d2YdATNb89xuGu20YUymtJSA6KcLGjnC6ARsrWX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EZlyBopqqBfJK0pCoPfGt5y6qmok+4mNJLG6iOJRz/hTFp2l6irWPvwaApY7LiQdpyuRCDs1XstBrAbe9y8exEM6NICn37ARFnlLEMGy5+dMrCUlYtlDHuSJ/PihPGQKphShxR58hFQUCayrsuIVuKww+INJdh+skMRkz3v2nYqrBxLrV/hHZIBu382Ivt2Qe6yotBDkG55vc46mMYCa++u8KIQFhjyc9wPMOVXmI3T9rlPgM14r7mq/6b2pWV0/BKtIRZJtnDuXbaYqCvfJ981gm8MAx0tjdzvq2VYgAFktKw6nK6ARdJYnuDVP1mMrgwL6Kbs6IhxURqTlwPWhk+YZql7Ezg5/VR/DKCA22shpWb56zHc4msfz+rMV3AIcp4k6k22SKEMCIN1iy3/NNG/B8Nzy1H2waS4VODwPp56X941bXGj1CpP0IxzuzEjUAPLu07cZmJq6/dWThm6cSfCvcWaJtDjpm/lO/osa5mdFOpCQpQP2TJ5yJ7GoONKne0LrZR8lhNIgy4wd76XTHDXABiCQtjhrWbH+xTuJ7n5n9PUJM9OVXCx8H6GNRNMsYYNuVHTWMDawBo3xYIr/EfH7/TC16w1uBK99hod7IygZve3l47UlxlxM+vr1PRCxk5WWTNeGBnmMJQxzimXAEkJTiFv8xguQKpvlW1+MfEK61gdMgQtGT8sVTNRNCRPOoU/8gus8zALlZTzMuSvNBl9y8tIvVSxYjjsPKatpKamY4K2fQqKFxm4XgPhoIOhLdIHmFInTX8FSPsrfrWHD2vl4mjaEfASD7J6NgGf4Rv4zpQtB7NNQnUKmSF3gTXBgnnVoYr1l4AY4/6dfqxGNffLWvYYrIExX0C+fjym/EF53UYeDSUjrDz78We6TjRU1IEQ3YLpJn9/SN/SbvX8HUd5zxc3zF/LCG7Ai5dbvQbprEnyRynEeoWBznsAs+BI0rZgSuREzl61sNczR9g0BMNP49s5Y/d1FrRDEb8BGwi8EDFuMhlhuOhdvMXSXxUSzqYzaRL7GJQFeUT3MTs4tiYDKpwTx1ns8oRyk1Q+H8BmH+xoBERhB/kGuRjmLM37gpUu79lXHII4QrAT/i1LqOhzh3QylUL5xwTjuMkfWCMmf0TEH4zkRMKGmZI6UG5iT8wK8jyupoq/1i9fFtBbzgFT+4jkM9aPiSQO8Jayq2ii8tVrBvaP+qKkZgN3eYDn7Iz3qB0qYwRBN01nh0VxNw/KOpnti9ZNe7RRmt7c7a5E2ELi4oIGDToH1jJF/DyLisjKrlRhPXlHzRXgRh9LSjA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cf68c8b-d575-434e-3641-08dc3e189329 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2024 20:04:05.1294 (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: DU2P250MB0141 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_ps: Fix shadowing 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: eQgOtfmFnWVQ Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_ps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index dcc51b96db..3c8fc33c7f 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -522,7 +522,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, sps->vui_parameters_present_flag = get_bits1(gb); if (sps->vui_parameters_present_flag) { - int ret = decode_vui_parameters(gb, avctx, sps); + ret = decode_vui_parameters(gb, avctx, sps); if (ret < 0) goto fail; }