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 ECD6D41066 for ; Sat, 14 May 2022 20:56:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46EF168B4C9; Sat, 14 May 2022 23:55:43 +0300 (EEST) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2365468B4AF for ; Sat, 14 May 2022 23:55:34 +0300 (EEST) Received: by mail-pj1-f46.google.com with SMTP id qe3-20020a17090b4f8300b001dc24e4da73so10128292pjb.1 for ; Sat, 14 May 2022 13:55:34 -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=k4Ot6YBf7kxvaxNZp98j6bswIlv/qesjEoDFN4x/JlIQAjLWzRCAqWMGnxQLP+COlw 11eOrrGn0+41biUHUfYXVdJFhpftn9UnwL9caCZVOMY/PRBOJAAyo4Btwg6NHSEmsMdp OT7O4edRMN2ykrSzwF/sDvckK/FR0I94uklQpBHee5MiKlBwiAbg1OaVswOZYneDJeOb MrPQ2EFQtKRiQjz6TfFqg4dwR/0/gH56fLmSAZAuFAy8R2q6pygWUEksLjjim/wOfWZS uXV5nLV4Wn0NpfPEy7+5Lwft7qix78oLc4a/8fMi/VHg3zirReUctF+L0kJkzJJa0pHp Gvdw== 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=RcbMi+gneO1T+UGycHiRDlIgPevlzTG9TmAWdC7czv0FyrCvb3O7VdTheUvX+1ytnm 3g+TlPNhnDGCLnJvoMd9ZDxETrwFBx97UNynetomv+FLtsnMIfIAiSr4X0b7XSTXehLI wXqbzfFPdUHyX9rENrNhXjp7v5SbBQZ44l0qTfQLQo0mn0bZVXVRu+zt+5AKn49km1cP LFy/okDjbtjG6UdQOFLBpCHYdJrj8Z6ZwfyOr673jv60BYuU6SDi9ZUQpSwWxjSkGsv9 /i9gpyy0m7oA9fHQrUJFaRNhRo0kO4wPHni+dcAlRDbiFwdj/rWecEsXvDAhkNLN2Uhz hqSg== X-Gm-Message-State: AOAM5312r+FSkD/E9JXx91FbCySAFLO+9C56th7FIG52X8da5gt8VolQ HEipGMy90u2Zzmr44PCZxm+qEaYecXyvnA== X-Google-Smtp-Source: ABdhPJzZcgVt0PlOKKqnHAWzUSNDdDO9z6DoBukCCw7MgWxSpgeMdYkRT7N7yrCZExodEpBQY5THiw== X-Received: by 2002:a17:902:b48f:b0:15e:da68:8f12 with SMTP id y15-20020a170902b48f00b0015eda688f12mr10779479plr.27.1652561731382; Sat, 14 May 2022 13:55:31 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id l2-20020a63da42000000b003c14af505efsm3876863pgj.7.2022.05.14.13.55.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 May 2022 13:55:30 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <1509b83f472346ed2bcadf4f6011f89701d8a9b2.1652561722.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 14 May 2022 20:55:19 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v4 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 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".