From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 473764293B
for <ffmpegdev@gitmailbox.com>; Sat, 7 May 2022 09:38:33 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B690668B405;
Sat, 7 May 2022 12:37:06 +0300 (EEST)
Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com
[209.85.216.49])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B07868B3C8
for <ffmpeg-devel@ffmpeg.org>; Sat, 7 May 2022 12:36:56 +0300 (EEST)
Received: by mail-pj1-f49.google.com with SMTP id iq10so9093908pjb.0
for <ffmpeg-devel@ffmpeg.org>; Sat, 07 May 2022 02:36:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=from:message-id:in-reply-to:references:date:subject:fcc
:content-transfer-encoding:mime-version:to:cc;
bh=cunZ2joGJwKy5jYM01rveiBAdrOz6nFehpzzYrKDm5Y=;
b=c4yi4r+TFD0JksOW+3Uk4GyusXGmLu/j/n38Gk44V4z8kA2A88QX6YrDWfzith1KZW
9vY8VWCxw1Hey8j9uAYLbzEpDe9a8Pp4JOpi1dFfHbV8Rc4AaeImc++gXCaxJms/kYkQ
verb8zdbLq8j5tykC8ryI9Bti4mhw2xpMNQR4AVnA03M++adWokaXSpYM7ykwSnG6m78
nDtfTiUhw8Ea0JAHwyj9LYHiyXziHy6k9GNBqyBcaCWMqvfKiwITlVbd0IINOvlR4YPN
YWeTs/4+jGvyRvG5AyLOX80pFSRJkbgLO4B2J+VIIUXL4katTNDUqpdZ+WXuSaEF8aQP
LQ0w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:message-id:in-reply-to:references:date
:subject:fcc:content-transfer-encoding:mime-version:to:cc;
bh=cunZ2joGJwKy5jYM01rveiBAdrOz6nFehpzzYrKDm5Y=;
b=1fvfXx+ZLpiH39BV3sJwOc9O2n+Y+5JNVdI4i87OjEI9SSWbsHtNn1Q/dhUZXbQnCe
yLzUyUO7WQvPIj9AE2ZzuZsqMqd/LgNn2+D5AcZDmk7jG7lzpcrcWGNzcbsvwSGIkMZw
IoY6UcPWAgLcF+nnW1cnKwEhyz6TsG4xoVq6E0TF/XwItRqsvrxIrkSox94rqUtFCmUj
Ja4SoAHXaS7rQ4PaOacahWRz5WXrIFTKufRtGUdjI9bnu0pxiU6lhMzRg0vT10I5JQLT
c2glPpxVAuZhdxHXBXbZa/fub7T4A6weIHF08A9dNyw/2tHiNkqkyavb575P1VxvfwvB
CxMQ==
X-Gm-Message-State: AOAM5302RmB2etNvAAQrOq0JbTRu2BBHSAT8p7X8qZ5zxA/5y7YObJtc
G/8HOQ/r/QfflaKrnU3801jHB7gYXNKUwg==
X-Google-Smtp-Source: ABdhPJy80exM2fxrWbieyS8UwvijpZPaGBjPkUKUrGda0PWZXQBdCJ1VczWGEcJ2orT1qZzar/m7Eg==
X-Received: by 2002:a17:902:e5cc:b0:15e:84d0:decb with SMTP id
u12-20020a170902e5cc00b0015e84d0decbmr7567573plf.91.1651916214929;
Sat, 07 May 2022 02:36:54 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
y8-20020a1709029b8800b0015e8d4eb1b9sm3253410plp.3.2022.05.07.02.36.54
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Sat, 07 May 2022 02:36:54 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <238290bbceac2ca2ea46f747c589ddf758b19b49.1651916204.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.12.v2.ffstaging.FFmpeg.1651916204.ffmpegagent@gmail.com>
References: <pull.12.ffstaging.FFmpeg.1640186030.ffmpegagent@gmail.com>
<pull.12.v2.ffstaging.FFmpeg.1651916204.ffmpegagent@gmail.com>
Date: Sat, 07 May 2022 09:36:41 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v2 08/11] libavformat/asfdec: remove variable
redefinition in inner scope
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: softworkz <softworkz@hotmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/238290bbceac2ca2ea46f747c589ddf758b19b49.1651916204.git.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: softworkz <softworkz@hotmail.com>
Signed-off-by: softworkz <softworkz@hotmail.com>
---
libavformat/asfdec_f.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c
index a7b5ffe465..8283f245ab 100644
--- a/libavformat/asfdec_f.c
+++ b/libavformat/asfdec_f.c
@@ -1181,7 +1181,7 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
return AVERROR_EOF;
if (asf->packet_size_left < FRAME_HEADER_SIZE ||
asf->packet_segments < 1 && asf->packet_time_start == 0) {
- int ret = asf->packet_size_left + asf->packet_padsize;
+ ret = asf->packet_size_left + asf->packet_padsize;
if (asf->packet_size_left && asf->packet_size_left < FRAME_HEADER_SIZE)
av_log(s, AV_LOG_WARNING, "Skip due to FRAME_HEADER_SIZE\n");
@@ -1250,7 +1250,6 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
if (asf_st->pkt.size != asf_st->packet_obj_size ||
// FIXME is this condition sufficient?
asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) {
- int ret;
if (asf_st->pkt.data) {
av_log(s, AV_LOG_INFO,
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".