From patchwork Sat May 7 09:36:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35633 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2088803pzb; Sat, 7 May 2022 02:38:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyH7cwqiAy0Vd0E5HocBNO1YcXrZMmB7kQEiaUYLIJ63SVoTRXgK6kZlihj7/dYa6N0a2JZ X-Received: by 2002:a05:6402:4241:b0:428:177b:5fd with SMTP id g1-20020a056402424100b00428177b05fdmr7678358edb.193.1651916315889; Sat, 07 May 2022 02:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651916315; cv=none; d=google.com; s=arc-20160816; b=NPDl5L/e9WfEYc/NNmG1oZSJ5QrTl5TcnRNQwvwj04qQl5X6C64VdV/cE6trx688bM KqxGLU30P3EVm8Ffti2XRkrUg8j4s/0KrazRfSasPYI5wdTujv+dkriRzIqP8UfjI/O9 8z7oaykqZz64aeMg9zCsmzvdFvxMeCCt/m72swrBrhz/PSSFgVYCh0Iqbdbe+JxTnz96 PYBEnJpfS1/bNE6bIZ9ATGZfoWzjp+KirNkNiN3JhDvw+rxLXa5sPO+HVc3KDVks0jQr 7CMIdelsOm7XhN8ZCaLRwLGD8NXCVHfRAXM6X4DeSQ86JVJzHSKvMYZI/p7qNGfCXRbe 88Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=AVb23WscMhusqg/UG/i6pobyGp7SkuyNfqwDqDgRjRk=; b=iggJGydEIDG1bpeO/ueahac7h3CRteY9etAhXbTkeonXiHiaW3zDhGwLk6hI0IQeCu j9chuf6jT0uKLgaw0IYO3qNAC71njXAh2R+QWL5rY4azlwHFFxxFZPfgYcEZ2URZ6Kcd JN69kucPtMOnqlObZXDwn5uVwYJ8ZEJr39JIXbeLz1BQmXRoGOJEfJbOrUvN8XlDk747 bvWTQctMpwuBUC4OyKQlj3X+WaKT6si5n8nJ+5XIDb1jzcMweQLr0LBBglNqC01F6/9+ zKLa36uT8t7Y5VEC0K3JD1aSb3w7iQOKgyOgoZxKkuT0Eaca3501PDyCU7lkIDKaJrfr pFng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=c4yi4r+T; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z15-20020a50cd0f000000b00427b431e10asi6328392edi.469.2022.05.07.02.38.35; Sat, 07 May 2022 02:38:35 -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=20210112 header.b=c4yi4r+T; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E25AB68B408; Sat, 7 May 2022 12:37:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 ; Sat, 7 May 2022 12:36:56 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id iq10so9093908pjb.0 for ; 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-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 X-Google-Original-From: softworkz Message-Id: <238290bbceac2ca2ea46f747c589ddf758b19b49.1651916204.git.ffmpegagent@gmail.com> In-Reply-To: References: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WmIwGCrXavpA 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,