From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by master.gitmailbox.com (Postfix) with ESMTPS id D33F9406E7 for ; Wed, 22 Dec 2021 15:13:58 +0000 (UTC) Received: by mail-pl1-f181.google.com with SMTP id w24so2080138ply.12 for ; Wed, 22 Dec 2021 07:13:58 -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=Shs+z4EgDSysg/7OnnwvJ6gaYqJzvQqHHkElNMD15yArNhTWsmojt2RpcPujpMtIZr FiBdEZQ2bfgl/zn3PPxBCJ5iJTAE6SLlTJRcL03QPncpOz0JmaM0r4hpoZaIDZMf4C5z lOLSS8SiI13lhVAuhwr6G9vebQq4EkHXKiVAzJCy5JfCy6MrQ70YVI9ZaljsHfjGQtny nVT3nM45nrZmzHZ7htiwcbB5gqU+8RH/EinmHm7Q+X4VkFavYVNaH23/EKEAgNVVUFcM /07iIq9UDT120japS3lgaiu12zUbxbgA7e07P5SHfXTaOzxQUaDNAw6SmGPgmHifDLql NGPw== 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=6PZu2HWX14nNJoV+lhyDyHQlXQALTaMQ5qfYOaDRAD8Ve24jdMGM5QwEf7LUK/8huK WJLpQZiQETe29JTzhziRoOnbIuIqjqE8hBb+y2hVesFq1c8pzGvl9CCKlBJp8AsVhuKM qQGjMBP/h0ihQbe2lh/axmRxgoN3nmphrsYp2Hw1xqEhDwYNCL4VwHnGENocQPyaot8k O2GaSQzRBMy27wj4WBWhM5BRCSV0dat20j7BP3yLk/ky7N3RcuqppihEConB7RToB+A3 eEYX3FiJMB8aWv++h9kiF6rpgwj436ExQBJYQxulkcN3UUUI7y9mVLJ2pBRJOkWkUwJc OyEg== X-Gm-Message-State: AOAM533MbPgQEjxn3j3QynrkdgUHL1+fKoArmH+cOEhpNKDkMzmctI4U poB0wvz50FWYBwPEo87NQqN6q4vaoaRHq/kV X-Google-Smtp-Source: ABdhPJxoUWOfnnUq1Ksrqf6x2/9AZyeXEml2iibg4Q+AtfZzPHz7Mbd4qUWA9so1l0wbNUAQyq0+AA== X-Received: by 2002:a17:90a:520e:: with SMTP id v14mr1782871pjh.221.1640186038609; Wed, 22 Dec 2021 07:13:58 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id z18sm3245575pfe.146.2021.12.22.07.13.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Dec 2021 07:13:58 -0800 (PST) Message-Id: In-Reply-To: References: From: ffmpegagent Date: Wed, 22 Dec 2021 15:13:47 +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