From patchwork Mon Sep 9 00:08:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1369569vqu; Sun, 8 Sep 2024 18:39:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpDhaSA3Yc9QKyc37vUfvOZqxb39nZXzJU3yfoym6XliT9T3fy+kUuMS0GmhZqkw8HVx9BKENo/FVVnAbwF3Mt@gmail.com X-Google-Smtp-Source: AGHT+IEIhBOBowv7NwOUo8IiQBWp0yXa5suoiLju8UDirUXu6ZE1EW2wl3szmyJg+RxZYHSuAylM X-Received: by 2002:a2e:4601:0:b0:2f7:4f93:ef8 with SMTP id 38308e7fff4ca-2f751eb351emr53875111fa.4.1725845953683; Sun, 08 Sep 2024 18:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725845953; cv=none; d=google.com; s=arc-20240605; b=UGp9IV1hFtJMo2KimOYQDwvCsTi2JuKpSOszP8ynWTmdSkFv7XYvZMJ20DPCRi54YU eiAEm16Sesl6EYh/iiQ0GKZobx/qdrWincn86AALAO3BhbfH921hxELhD/QnANk+yL3U CSohmeOwNnj7qVI/NCFgUSc9SbYAqTxxKhmSnmLO9XJpOW+IeT+3FrABOOImtlhiCoAx QePhI5EYkFJmgs3Pd00u4QQwxkfHBMxYIvLs7V2QRPGJadDsT8IEoowfWyT4d0eMR2kD DODlw2fqGEc8FMLRB4rLZjjCw/ILQFImkNzO1t6Et1WaL+vXBDuQiKs7TzkkGK86W1FC 4M7g== 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=ISJqkTxUGIiO8ZUZ+aA1vkEYCE5REoE38/twKZHJjVk=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=YkGs3N9EXV9klutNx0iQ1+OYxqH4zq/SekDBoYhset10GV4i4Kt2AnVDrwF4pllb1t qqF3UBGmCGENoXpYN9IxI5RhNAldBQ8csbvl8F45/Yqh4htCJCOd1+iYQi4Ia/gOCsWQ BHcrxS+vrl4SoKY4wZRh0GwY5HCQWCXic2aLTXH8kzGlElpgafs+WZJ8z4nNlG9ozunC ja0FJ+8XPZyFd9dQL/Fn8Gmi+97mxZRZFMMEB/Nh/ESQqbFxs7WXiI/Zroc06ElaXSR4 BUjMSWiReOmrbk3o3rPGz6j6RCTqnqgbhkRRQACW7mciQsYHwxHHjb0BXJgcua3VmsCd 3Vrw==; 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=HOqixM5F; 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-5c3ebda968asi2911158a12.528.2024.09.08.18.39.13; Sun, 08 Sep 2024 18:39: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=HOqixM5F; 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 0AF7968DE59; Mon, 9 Sep 2024 03:56:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF78D68DD84 for ; Mon, 9 Sep 2024 03:55:49 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42bbe908380so33656335e9.2 for ; Sun, 08 Sep 2024 17:55:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843349; x=1726448149; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=CFjM0saKNXMh8IRajT2MNwQiOw+QJ7pZ98ETVECv8mg=; b=HOqixM5FCS2NRcib+h4hpeUCQvB+H8goDqO8wswU9UUG+xOvX/jnIl9FpM87fVk4nc pCBadvVk/sMxS9eJzv71jm9vloa2aAPITXPXD2HacyXxGbA6S9ydPJluW77UTf9GySwE o7uPWhjw9XgUSWlF92Ack41CSLR1LWSgm5spxThdpTJN8oIJR2UmAlvqo4pyT/GoDL8f 7X93WOq9UUbF+EOl+Hwaw7dKnkpqz2w1MntFCkT5ASY+oa3+Cs0w7t7IIi6mbxAXWIWc aBX+kdtQ8dlnDRiwbN8VQ3eVzwam6rnEBtH+o1hW8wwu3smLXZt3FJZZnXIGA8U89E/f 6LSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843349; x=1726448149; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=CFjM0saKNXMh8IRajT2MNwQiOw+QJ7pZ98ETVECv8mg=; b=kItn+D9wV5uMdsPRfdNnRKEB0meg11qFcnI+5Qo4UVEIKLzSjWeyk+zwy/Dnw+nzvX 3fEk60myUyhac5WQgITWO+wbhNxID05E/8QxrftyeHS4pRj6i/3fEScJHvKpEgcXPsj9 zmG/u97Pee+zJBNIK+fLIOCmTawkJ5u7RgB8hc3Aou/b36E6dK8y1BaGA2CYGOBwmgzZ ia5xh/ft58KjscmdhAYSuakXOotopkmzzS/sjfC4Jxvidw540JnTmMQuwAdatcIOGZ9D 7Dr+Y3Ee/ZcMpwVFpscaIcEBsyAs8ijrCLBv8X7YBXkw02LWeshMjqjedFEN3SrpFzHL pS8g== X-Gm-Message-State: AOJu0YwyOYEv7CVgrOXnHvykK7nbEY+V61I1AKy4PJ8aQPmsyvLj423d c8kgv106BUQ9pL2Ei+bOUu81pl/xmIEIkkD8tJYp2U02aSKJMO1NVAhL0A== X-Received: by 2002:a05:600c:3b11:b0:42c:b197:96d8 with SMTP id 5b1f17b1804b1-42cb1979a72mr27825835e9.5.1725843349108; Sun, 08 Sep 2024 17:55:49 -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.48 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:48 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 02:08:55 +0200 Subject: [FFmpeg-devel] [PATCH 53/60] avformat/nsvdec: 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: ZhYai2dkcqWW --- libavformat/nsvdec.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index dd01765d7d..a55da05226 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -380,7 +380,7 @@ static int nsv_parse_NSVs_header(AVFormatContext *s) uint32_t vtag, atag; uint16_t vwidth, vheight; AVRational framerate; - int i; + int nsv_rate; AVStream *st; NSVStream *nst; @@ -388,25 +388,25 @@ static int nsv_parse_NSVs_header(AVFormatContext *s) atag = avio_rl32(pb); vwidth = avio_rl16(pb); vheight = avio_rl16(pb); - i = avio_r8(pb); + nsv_rate = avio_r8(pb); - av_log(s, AV_LOG_TRACE, "NSV NSVs framerate code %2x\n", i); - if(i&0x80) { /* odd way of giving native framerates from docs */ - int t=(i & 0x7F)>>2; - if(t<16) framerate = (AVRational){1, t+1}; - else framerate = (AVRational){t-15, 1}; + av_log(s, AV_LOG_TRACE, "NSV NSVs framerate code %2x\n", nsv_rate); + if (nsv_rate & 0x80) { /* odd way of giving native framerates from docs */ + int t = (nsv_rate & 0x7F)>>2; + if (t<16) framerate = (AVRational){1, t+1}; + else framerate = (AVRational){t-15, 1}; - if(i&1){ + if (nsv_rate & 1) { framerate.num *= 1000; framerate.den *= 1001; } - if((i&3)==3) framerate.num *= 24; - else if((i&3)==2) framerate.num *= 25; - else framerate.num *= 30; + if ((nsv_rate & 3) == 3) framerate.num *= 24; + else if ((nsv_rate & 3) == 2) framerate.num *= 25; + else framerate.num *= 30; } else - framerate= (AVRational){i, 1}; + framerate= (AVRational){nsv_rate, 1}; nsv->avsync = avio_rl16(pb); nsv->framerate = framerate; @@ -420,7 +420,6 @@ static int nsv_parse_NSVs_header(AVFormatContext *s) nsv->vwidth = vwidth; nsv->vheight = vwidth; if (vtag != T_NONE) { - int i; st = avformat_new_stream(s, NULL); if (!st) goto fail; @@ -441,7 +440,7 @@ static int nsv_parse_NSVs_header(AVFormatContext *s) st->start_time = 0; st->duration = av_rescale(nsv->duration, framerate.num, 1000*framerate.den); - for(i=0;iindex_entries;i++) { + for(int i = 0; i < nsv->index_entries; i++) { if(nsv->nsvs_timestamps) { av_add_index_entry(st, nsv->nsvs_file_offset[i], nsv->nsvs_timestamps[i], 0, 0, AVINDEX_KEYFRAME);