From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6CE654310A for ; Sat, 21 May 2022 05:22:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A510B68B50A; Sat, 21 May 2022 08:21:58 +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 04BDA68B379 for ; Sat, 21 May 2022 08:21:50 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id v5-20020a17090a7c0500b001df84fa82f8so9349828pjf.5 for ; Fri, 20 May 2022 22:21:49 -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=yzHwJgJrV+iip743k9ftZfJnHMwka3KcfJ0xROVDoJE=; b=bXya/sZqpyuw4AXnPPoNnPbWLEdcVllFuqT7YgMsbVBtOq/aUtO8Xb43wVYnjMRGyZ XSFs5mEhlVVxo8K7UnNdbvvBLkqwgfSTBFPq6YjcZmBWtI+OJ1XA+BVMaYi7/zM9qy9z g7EvjeGfqpmQQI6EhE5wFAm0AlUbG+oPf5Gq/riDrLDRe17rtnaKtaONtlr72bWAXfU0 4B7bFzDYfHeIYoQwYvhX8y9u/Ps5R6Yar5qYVxw4Z6K/4bZDhkJ089IN0d2mvcrrOKrg jy4tp989jz9fOu1lFvNq/zNN32mMX3WLHEuUUR7kkhZTgOWPif7gEZ0wU6VR6Sr9jzdP u/3w== 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=yzHwJgJrV+iip743k9ftZfJnHMwka3KcfJ0xROVDoJE=; b=hVcN8W136DaFnLwW97wCK6yuq+i38SaZxKmERJ0hGEd+ao8pQ7r0Qe6V4NE5c/Kw/a Qa/hH71AIW8TAGH5GhiHkrk/xUxzjtAL5I+noBn/u+3B4BFh+UPhedmVna/2dFSGBj8W BAaLXiyordgOA24n7BPtwKgE4mXo8Ay1QtHvesc9r/QQJrJ5BW+9SFF4hr/sC1wScL5z PpO00JHw1kTcFqV/TofipCtPzb5mvmxTt8V26nofE7Wl9AZ/Ojp2pix/h5YJrGqq4p57 UXpdB8JQlAfZJZDDRODEmrsVMx4hnVTjV61kCr7lTZQWfWWi+S6Ae8iq51on4A6psQbf 8QRw== X-Gm-Message-State: AOAM533bfkVFqTIHrJkLi0ABfhwOItGSaTBcwFFfm3p8vH7Y+NWQzRP0 AcJAjZ7CvBBjl5PSkh0g94OprZGTAbuUsw== X-Google-Smtp-Source: ABdhPJzxdzVqDLH8L/oyvdB70LcjDr94poR7LzXWkR0O38v06D7rT4ATk4gUawWvvwTS8nHVO2nNcA== X-Received: by 2002:a17:903:234b:b0:161:cc0d:64c8 with SMTP id c11-20020a170903234b00b00161cc0d64c8mr13018129plh.37.1653110508450; Fri, 20 May 2022 22:21:48 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id y128-20020a62ce86000000b0050dc7628130sm2811853pfg.10.2022.05.20.22.21.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 May 2022 22:21:48 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <0d032d9d4cf26eabe7ebd79874563f11f3763cd8.1653110500.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 21 May 2022 05:21:37 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 07/10] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Michael Niedermayer , softworkz , Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: softworkz Signed-off-by: softworkz --- 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 91c3874ac7..fae15d9b05 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -1191,7 +1191,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"); @@ -1260,7 +1260,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".