From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by master.gitmailbox.com (Postfix) with ESMTPS id E45A94072D for ; Wed, 22 Dec 2021 15:29:36 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id v25so2407941pge.2 for ; Wed, 22 Dec 2021 07:29:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=55DmZy69KuOvH67hBAmLFJ0k5LFWhLngmi3ZxvUzEZA=; b=diSO6JnnNxxjoeOHyyz5rcsfkU5A0JB6vDHygXcn23esjRyc1O4Jc9HRIhD0F+FcxA UY8VKNwRMLQxyQq8qy3U1cSdyNjs0qrHgs3ttSvmzfujdEhtSeSOSnUvHyq9c0Jeyu6J +FHEFu6BdPJhn5B799lRIFHHCuDzgWyAgmfd0UBBi46Qu71DQ8G/J/sUhFYrMMPidXyy 505KcJHYWdfo1S7KgJude2m6ToCU1WsrunJCfzrsnLB9Aud9MJkz3G3UIHswsxrp7MQ3 vDIphss+t9UU1Jmu8XyK9SoilSn8EggP2LMmSa90Z/1q/mvJIWaMA5h577ayzA4lKVIf kq/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=55DmZy69KuOvH67hBAmLFJ0k5LFWhLngmi3ZxvUzEZA=; b=mIzmdYj+wy8HxvY7P+GiRIgNdSNUzQJDfIRC8vzHj0HSogEbyEqVcyVpASpiSW61Vh UWuPOwTQMa0MKTKwlFDRaUf7K11s6hoPp/vFlUaQQoAxQwFFttkRwtrgvri4BZwi447+ m8bXhUGRIfKbFHGl09IwIgfGy+1CKv+lFWkIqH8WlvQtwOB9Mi0gOCTw9TMOEUJF6LUR twQrnTzmn3pjzmkjq4BWcwia8HKx+ganvA+hgRckMECB4jb3Wba9tCSKF/lzK/F6L4K4 WkwwMNth7UVO+0p/yWdpj534uEKfs+zavQnMw9pWwK0iFnXQaXT4FMWSOhvs1oSPQDVF BkeA== X-Gm-Message-State: AOAM533E0711T+drDIIsEdxskhsTOBvH6hWqY5+hP2zLHSA68OCyrT34 8Qejv6oL6MfVDWQFAPk+iVIn9+xFggENSE81 X-Google-Smtp-Source: ABdhPJw1CLYIg6BJXlOtDXearGxefmT0pXkSJH/Mdz3NURjT+61SPPc/YFh3D29lcr61UbTQBh9DsA== X-Received: by 2002:a63:114:: with SMTP id 20mr2908606pgb.342.1640183596088; Wed, 22 Dec 2021 06:33:16 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id j23sm2375963pgn.40.2021.12.22.06.33.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Dec 2021 06:33:15 -0800 (PST) Message-Id: <3619d83fa5d4e8302db84de968265fd523ee4602.1640183587.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Wed, 22 Dec 2021 14:33:04 +0000 Subject: [PATCH 08/11] libavformat/asfdec: remove variable redefinition in inner scope Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: ffmpegdev@gitmailbox.com Cc: softworkz , softworkz 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 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, -- gitgitgadget