From patchwork Sun May 8 03:01:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35696 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2387298pzb; Sat, 7 May 2022 20:03:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyGN2QktOg29BBJ9FMoExabe1c/+tJkSO8sA6z/GVMSIXungzSEHG1rElkSH/hZ3pDgnx+ X-Received: by 2002:a17:906:32d5:b0:6f3:be75:8485 with SMTP id k21-20020a17090632d500b006f3be758485mr9259675ejk.685.1651978988671; Sat, 07 May 2022 20:03:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651978988; cv=none; d=google.com; s=arc-20160816; b=Dv7jaxuEo3oOEDu/zB2Zyb1+BaF6XddhcCUGRBZrvXLWE3Ktg16TEslKXp4q9Q4a7T SSTztBXO8G0sraRVW33BrtDlPdF4AzDPrZIXXGW/vptpS4SYM9vWUljKDatWIRxaTqtx fwjoNIEN7YuEfXa79daeO2xS8kB4fLmFjsQ0ByO+s+0hNBQ9MAioY+R1A4oj6X/+rgwK Lq1Yf4WPkKjPpcTAw/o01NX5UJ/FomSF3GVKwo8y9FsnD+zGdgO5STTKGizGnICHKBTx hTPQhxD4WknIOHpBv419sH7FiqOrM8ubk/t3+pmT9KyFi5PLzpNXaaQAE1VGSHeLzpeb XWnQ== 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=ejKjeu8WVLmAIJ+I0QgrVMuVThAJnHx9lR5YANX7aNQ=; b=xDbp18RrIku/iSSrDl8CUGgEAnxqNpyMIw4YbySIGDoQKpDA+wBTuq27l2yOyCSYHP SPVmnwMKu4ZsbNbg7ZehOajLflzhriYUQTECW9q6iCKZdvMg2yPL4thoz5JlInmwr78P PIltk5VR1xexF6W4NiLH++EGBlbKgCrvs0TpCkPwpe6Yoi3NFsdxu5DcRVNe/my45kEb D9U9QJhvyRh2jSfjQvAQiSjluf2eu2DYPef/mt7/fdHZh9JTHwTVuT48exHv/Rx1HCPm EpQrKH1nhkf1GgAjQB87uxJ3LUfNZ8XbwOS2I2a5+g2QsPXM+5jopRlVahxtmTNT1V6d J4nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Gr2L6BX6; 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 y13-20020a170907250d00b006f000860e56si7879732ejl.93.2022.05.07.20.03.08; Sat, 07 May 2022 20:03:08 -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=Gr2L6BX6; 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 76DE768B417; Sun, 8 May 2022 06:01:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1ACFF68B3F4 for ; Sun, 8 May 2022 06:01:33 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id iq10so10363459pjb.0 for ; Sat, 07 May 2022 20:01:33 -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=AwZsZwrhC1wljXcOzqR7Cj5P2xoJ+zfjBno70wqSgM8=; b=Gr2L6BX6VRe8eiZ98AtxfzHYTsLoJDfW33Y8Y0veBhgGuKNgK1XnLlUylw6YmCYVcB qFohVGC5z1RERSRyjRwu7HHqQVi0ZcuD5rbXnkQ2+v3nWnyKAUV/t0lG6jZAf2/hMhxg MTnMpYJWlbTwhKfJiC9oEbRmFTwJxsaHmNMHhp7qiRmTLFP2RGjfy0d/wRCAgV9IebQn 8ntwkIseHWoPw5raolUEAv6UwA2vxGITpNNludvu8ZH6R23tFq22HmkJ9OvhpuvE7Lqp yYlLCy+IG10VSme6RfU1OMFR8I4+o5roYRPpMX+W2G6Sv+3XDL/hg7GvQOVBXgO5xO0k KiOg== 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=AwZsZwrhC1wljXcOzqR7Cj5P2xoJ+zfjBno70wqSgM8=; b=ORdhkhsdr2HquXHZ9+lBnJQW8xqTK3oumatf63VgqNh2mX/7j5osI1tBgr3wi1fLzn C22E4pXPAoaSbjb0nYWqRWFZYa/ttiT+NOBa7O67f6CI9YtMsYy/Jbb+7slAFVhevgk8 J0DMlEDJC6y54cwytA2/4QWzSpWqcZ1TRYAxk94lL2zVJo2/OhRnAdkrBgO3qHrp4ehB SrE26ufdLZfa49nPzffvxQLWDczXPoW0eXfjz9mJiF+2vlc2CWGkShnAnbESUurytLoN bSDx1P785Q5Yfgmy0DfrxJY+tyPBpUrUBB94xYCR4gdegBStJjuJ1O5IAp8WJCxBQ/5b azjQ== X-Gm-Message-State: AOAM532yQtuoGA96P+uPhR+tmpz7rAYKiwCzjTLwPvL/T+HYamkGwv4s sY9dyO6J+B+AjxJg+9Fz7yZvkk+scZhp+g== X-Received: by 2002:a17:902:e882:b0:15e:b9e8:ba1b with SMTP id w2-20020a170902e88200b0015eb9e8ba1bmr10527452plg.71.1651978891564; Sat, 07 May 2022 20:01:31 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id oc15-20020a17090b1c0f00b001d93118827asm6215850pjb.57.2022.05.07.20.01.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 May 2022 20:01:31 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Sun, 08 May 2022 03:01:19 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 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: Michael Niedermayer , softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: S0TKoaZvoJm3 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 9a6f45d9a5..928e5717fc 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -1190,7 +1190,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"); @@ -1259,7 +1259,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,