From patchwork Sun Sep 8 23:30:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51436 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1398745vqu; Sun, 8 Sep 2024 20:34:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW8ssYfwMLrIgjNieWnJdwZWZYHM3C2SFhtnKXrRAtsnf59wHS8fKw8+Iwi5J8SkbWp3rRxgVb4X6fB7552STrK@gmail.com X-Google-Smtp-Source: AGHT+IGA4wgn6itVsIHopwKk0sDeAH5Yr4Bui6gS2AB9FxXoQDZqSdDQNMql3Ei2xt4o9JeNE8JJ X-Received: by 2002:a17:907:930e:b0:a86:9644:2a60 with SMTP id a640c23a62f3a-a8a885bffb2mr852495866b.6.1725852853759; Sun, 08 Sep 2024 20:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725852853; cv=none; d=google.com; s=arc-20240605; b=NOaNk2I+AAPiq05qP4tvQoqoCtxJrXO8oelEHXucjo0bUkDBr0YdNQOCOJd7pj/6ey f5HhycwBxXzIWfDrOv/gZeWhlq+60Y4Vsgm4aawKdUyyr7/BgY9T2Pj4sfJIj5kl3C9r uSKzHcA14pDtm1GaCMMMDTG95sj4UtN0Dr12czRvnQDKjHJHs5JDLOBWz3wSXl+vYEeo f9YyYl/+msaKKkc4kStLSVXU4I+XjpA3bySm0YKEYzRBNFgFpYrxKQT0rrYMXvoMzwzd 4XlbQCH96Yx++7L2m5Vz2Eah5QK6lp72+Mz4HF3UtTFKeNIGuX719LQtq+Ri7lW9e7pl BSWg== 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=exZZjSVZUKFl/ZS0ko5mWDB8RnJZS/xQt21gi2F4TYw=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=Jjmbhy9SRp0yKwYHFCUDmY2PncpqPt9mHeYf1gU6Mn+qD80/W7oU8e97KRjHq4lizQ O3zs5wWFtGsIYJHAQyC76PaQPT+uu/41Nn7Y2MZ6019kWcHr6h3ojP0+0TaWqsPuLH9s Cggy7aVHkg79S0WjSIVf4a2e6+vQV7FHkhGq3vPz8DVePNegwr7I/smyF3Hqg19iDEUt WnlXIvzHlkRuditchbghCJVWFPTl0YeZ7+SF9k3AupIf2ybqZlyl63BfmWbeyDRThbWq WZOK8YyLs8tdKGMRFe02Qcflq+hiZrQEHUwcWf9ikUEIxRSZ+4rxINtLCt7RvEb7K5Zk nWTA==; 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=Af1kV0vF; 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 a640c23a62f3a-a8d25c5168bsi305510866b.305.2024.09.08.20.34.13; Sun, 08 Sep 2024 20:34:13 -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=Af1kV0vF; 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 46AC068DE10; Mon, 9 Sep 2024 03:56:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76BC668DD42 for ; Mon, 9 Sep 2024 03:55:43 +0300 (EEST) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-42cb806623eso3735165e9.2 for ; Sun, 08 Sep 2024 17:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843343; x=1726448143; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=3SHOWDcd72q9wOdyL0grqeD2xlFPMGBJOE1m357E6UQ=; b=Af1kV0vFYNBqMgB15kxaAsL7TzWxSK7HQ46dP0f0SOGubkwhSqpWfp3Kxw4Slziit8 faslbjtwLlOL54As1gnIAC5hhvO3NYJH29/cbLMKtYfoJBxA5KrpZlIrvG7TacPhJJSA diqHrm+/NnKWK94P7DqfoTzW+ViMRKdSVcBHb7q8BzPl8IMPJTqeyUd2AjCWtofF+Gn7 wPtFFttU1ymkRJPx/BFj124Q90fuzG3Y6eR5smfK01sXhNbjmAkWBk3BUw/9O3HJr+Zs Q+kv0uCONFFRwujdIRWEn6rZSy0OC0YCwJeNUp+NX52Y1uPHrBnYmcWAOpQikVG47t1F 4bvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843343; x=1726448143; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3SHOWDcd72q9wOdyL0grqeD2xlFPMGBJOE1m357E6UQ=; b=xJy/lyvdu/wA1/7WLXhU3z/GyWooUTibvyy9xPxtGrgIUOqOY62CJRjJijXfG6oxrR RUM2HILf6sfrC/e1tcfS8vqluxdOKP+/3alEVRC3HzaCkzofMmYueRN6TwlrGod1FWBj JwYwfcPlrGE7/HE2shB1h3G4p/xHaUSjqooEDavaPTwQdZHlSLJWKeQm3xNxSb6fCVWc QUeRkIS31q/HGpSp4vVb2T1J6oGmdQ9pAVK4upW8+N5YXKWRS2Q1s1gTaDUB5RewWXBG RtjxoBbBBRu/A80xHbVqZb5nwINT5Lnbj0Hgj/cSSKp/XM4ppTH88OnEDXbp0kLphjad CM5Q== X-Gm-Message-State: AOJu0Yy71zz1efSZ+tXq+tNGiNPTJbk+LlNP4SMn8T/jGisr8+c3XxJP 3JTAuXQaBfuXy6tJrxN4eo0R3mFjtXORL33y2DuUM/XlERtES2oO48itcA== X-Received: by 2002:a05:600c:190a:b0:421:7bed:5274 with SMTP id 5b1f17b1804b1-42c9f984498mr78096945e9.10.1725843342633; Sun, 08 Sep 2024 17:55:42 -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.41 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:42 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 01:30:59 +0200 Subject: [FFmpeg-devel] [PATCH 45/60] avformat/vividas: 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: y/hqmbWjwrPC --- libavformat/vividas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 130b81ebbe..4cad6c6456 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -417,7 +417,7 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, } for (j = 0; j < num_data; j++) { - int ret = avio_read(pb, &p[offset], data_len[j]); + ret = avio_read(pb, &p[offset], data_len[j]); if (ret < data_len[j]) { st->codecpar->extradata_size = 0; av_freep(&st->codecpar->extradata);