From patchwork Sun Sep 8 22:55:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51457 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1441700vqu; Sun, 8 Sep 2024 23:24:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVz4JwUE3so5nCZ3bfBjHvAQEa61Z3sC14SWMNuUnrV5pBgf3wZ+6dAImsA7cgll1Swqrk1hqx7HJPuiPNLTHIE@gmail.com X-Google-Smtp-Source: AGHT+IEbd5jRMWjAHuGJLoVJb9SltIW+03M1kvxFYxmy/zDWRzZCTJoYrTqlOaawzOVzXCAKaX/U X-Received: by 2002:adf:fdc2:0:b0:371:8cd6:b2c1 with SMTP id ffacd0b85a97d-378896c38ebmr6140169f8f.48.1725863060858; Sun, 08 Sep 2024 23:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725863060; cv=none; d=google.com; s=arc-20240605; b=gfGUcv8rE74fa9xHFaZxCTKsexfiUMyZTb+OVOsD+fJD5vVGBKXX1S3slxf3DTLXub rJ9K9GwKVl6we5LwF2BoarxkOJXEreT+Q/kwco/fMLvY3cQvK3lnDHmbygoq6ngloCX0 dAjI1WdPxcvzUm8aHl2kXI0Tf9ZoQ8LdgodeiPEFdgxNlF8fOSewUoyVX5O1BJdxDmxT NBX71BTQBoSLcXgRtmdbpqTt9xn0Qryz20ieJ6dtKh/s1LjRmksprY0gExxn1ds9Faxz J8FTDXPZTpQKMkmBUl/YGJgY3rAwGNE7WK4Fg06b3eM26ANhOo/VVJaCBnABv5C3sK7b qJFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:from:to:message-id:in-reply-to :dkim-signature:delivered-to; bh=2hi2KI8i6UgW2zqKO0O2nkMQY9fHW+GUPf2HeQp+RNM=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=TcDMeZBRgd18cDnBnnERM0AC9W1oSaqwba88HRLAgqYaE+8oud8C66LAN+q3L9IBgF OX3YLiGwmRk3Oxoi/iuGZBa6bKPsY/HxWyh+wVDhgeQG3lSPc5xLNHbQqNV/d4oeGN6e DZBHzqEHuQFXEZvML/jTbT0zx6/xXN1QHUTtjUfN5YRTZAPOG1Xr/9ifHe+exHJFhGkY A2mhg5Ff54J75hyI/+/VgJrrjk3eIDsj8a7tcnyaXd5S6UaAVdHhQpY1jW0TZGegDipy Zz7bTOYUiD35fUgrOR3US1ECYTLgIS1aFYem/FtI6zOnz0EImUpaJVrezAvMMbpnkTSw eeAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=KrUgaAO1; 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=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c3ebd42f6esi3276619a12.47.2024.09.08.23.24.19; Sun, 08 Sep 2024 23:24:20 -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=@gmail.com header.s=20230601 header.b=KrUgaAO1; 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=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 67F9468DDD4; Mon, 9 Sep 2024 03:55:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05EF168DCC9 for ; Mon, 9 Sep 2024 03:55:38 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-42c79deb7c4so31990735e9.3 for ; Sun, 08 Sep 2024 17:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843338; x=1726448138; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=YANr8GwUJg7Tsj1TX3oUUhHyo1KnByBWNex9/XKJiP0=; b=KrUgaAO1bXJlJdr6oDm+I9UXQOnU/AnxOS8iUgFezdPJhdeCFI6egkhmPpVxtzD5ZA 0NEh9xy/8ew1dzV7IlMo+Ewca8oQ4obvQRyb1APF+AIlq4g55g7POCaV39JKhx7u+yS8 70RFDtXmuhvDuXWwnLkCpg9nZErJ957C0wIO403He5z7Justyn8DwiWEa5cyED0+Mk2G vsTcFjQ17mmgVVON3g/RRP3R5Y9gx497UxDJcBWe8nmp1I0YCadhNAWf6Wvl/4uoLaVM knY4Qgbo64y50Mnl4X/sBRWMWYGTWi0u/8GT5av1nVN/CLDTQ/AJhjYgeT2fJWV5Xvcw ARCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843338; x=1726448138; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YANr8GwUJg7Tsj1TX3oUUhHyo1KnByBWNex9/XKJiP0=; b=WEX5TJVruJySnUomCoNi+/41biQpyDiShBIPM0t3i6tYBvn7huD0KVMsdH5Q+DT6zA bnELHiKEiUd67eUbxRQL97avYLHmcZB+SiEQ198v2pPiw88W/nAdDEjEZTMNeBcUBvg1 WkT6HzLGYQyhltheXQ1SVIn6CYcysTvVzjhq9zXIRWGUn3wWXagsMJgKpmA+DMwa9R8o epRzl7KcM3Ei0YodOgN3l1yD8lXjXpl1F3yMyYfNO0bglFuAAifuea4/dODheWDolbZw Ms+Ir0fUG9W2UaP6gnxAOIDVQDCPJhqtRi+pmURnSey0NctJj9BkzkptEX9o6sMd4vef XBBg== X-Gm-Message-State: AOJu0Yxy7FUcfo4PgCJ5mZ3U48Q5l2+30pnwOUgriL+uLTLPb/UgpRgt JL4OsdpELIXBpNgTQJZoLkue2cHyahxN25eb1fPf4tyxxzFEN/77EZnPcw== X-Received: by 2002:a05:600c:1f8c:b0:42c:b6db:4270 with SMTP id 5b1f17b1804b1-42cb6db448cmr11869305e9.11.1725843338165; Sun, 08 Sep 2024 17:55:38 -0700 (PDT) Received: from localhost (p200300cccf1178009d94fda8472792f7.dip0.t-ipconnect.de. [2003:cc:cf11:7800:9d94:fda8:4727:92f7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649728sm4583399f8f.16.2024.09.08.17.55.37 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:37 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 00:55:13 +0200 Subject: [FFmpeg-devel] [PATCH 40/60] avcodec/alac: fix variable 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7Q1JYIRKQZHu --- libavcodec/alac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/alac.c b/libavcodec/alac.c index f91288e97c..7916a006c2 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -331,7 +331,7 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index, } } for (ch = 0; ch < channels; ch++) { - int ret = rice_decompress(alac, alac->predict_error_buffer[ch], + ret = rice_decompress(alac, alac->predict_error_buffer[ch], alac->nb_samples, bps, rice_history_mult[ch] * alac->rice_history_mult / 4); if (ret < 0)