From patchwork Wed Oct 6 06:01:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp55828iob; Tue, 5 Oct 2021 23:02:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7sc0th49UNaAOUWQAnjYTrtLix4nsZIhh+C50jDfzz1uQ0s7/KLF1BQnlOSHPMRrnG3H/ X-Received: by 2002:a50:cf83:: with SMTP id h3mr32740345edk.63.1633500164799; Tue, 05 Oct 2021 23:02:44 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nc14si2924636ejc.445.2021.10.05.23.02.44; Tue, 05 Oct 2021 23:02:44 -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=@hotmail.com header.s=selector1 header.b=tevGmGvF; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E07A568AAE8; Wed, 6 Oct 2021 09:01:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97B0C68AA6E for ; Wed, 6 Oct 2021 09:01:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BAjpEnRbsol0kA4r8uDDzcZsL6zVRinyT1QJ+50UVjq9PnkW4DuAoYXLhQPfog7zkEsevNcCnTRMEt8aTqCd6vDqfOMkA1xo8Iun6UGGEcaN2byaLzD8tBRDXmU6+GcZRpe6LxN23NAclpBEGS5vWEbJVa6V68hJGUz73FkOW/9qR8/SnY5r/2p6y3oFRl1VAzOcJQx07k4jXRNi4d/mNylqT4D5JlLyCF0zeH+deSvUTJyadpBHRA7YH4PRPlOIPp8o0po5ZSp8J9Xemp4EL4y+ucYBZaV3PF95L2M06hnGIWFbME3mxTKePOGrL2670NAf/hNWZAQ7+h0K8/11FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=M/FKCMmgHJNWtu7vCkdpGkQDXqYs2eKyDzGb4ZhrH5Q=; b=hld24NlPTQ+SxaYhNdkqLcnqWI6IX4YU4rC0qsJw8LuuCz8nF3ZGB99jP7v6LiL7zXeTMIN7Iee+XQGIFxaG/p4GTsnS7siYaWX1+xh0WOFNtNgBfQTLCPpubhDCBzXY104bL2AAUHqan2jTDThp+valw33mRs3+MP6JFDQbFdzWno9qwLqt3WZhu6lukF8MDdtz+hcBsoGdDRwRz/nfhwYnbNkJOib17u+tSbgBEozYh5DjROuxaMKwfOOBQubkUaHQJM8lOD8XPdazyGj/yYpP6d6AHe0dP90qUpGFNRDgLMtcns94J4ZNqj6EiYVPyRuNQgbp9yU46DTQbtBJAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M/FKCMmgHJNWtu7vCkdpGkQDXqYs2eKyDzGb4ZhrH5Q=; b=tevGmGvFzY4wuT5HdCFwOfer0Q1RS1e8caZNHh8/7AcXmNhIupSNHEsc3vMbsYWloQuGkldCHvbsCvxNQC7NTuj7rr3BbGH3B2xRMs2zJDdM4yXQGXnN/MrImSp3/ZK69pGVwQy1Dq5uXz+qe8/y6frc+9HD2IBIkUcVdUqI5/iocfFT6Pl5ImlB2qFGRe6QfM4X7KaTqVKuKg6HPznYWIrI/rA2iK6r/HZAn46+quKfxT2cdeJ8ljDdJJFC7VCOatFLwHkadeS7ooMlYWfy6rVX1vJ1lJ7K3Ev0OFcjVJBywxOOvWwdaI0FvmcNWcurUSKDy4H18xBZ8QafZ4rODg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:09 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:09 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 08/11] libavformat/asfdec: Remove variable redefinition in inner scope Thread-Index: AQHXunePQVocf6igXE2Ys9ZQLJHjcw== Date: Wed, 6 Oct 2021 06:01:09 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [YZ0bMJxxyP8YY4CF+rc/4pop54jU5VKl] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 16ae4086-8e12-4c7f-f846-08d9888eb1a7 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: e4I7Ni2LykBOmYoTk2VnaDMaLaRyZzoYV51t8yzT8n/auHCedZtuybnF7rkc4m7EamHD0q6SPTmeHmhJZZKImtYA3SZVe9ccplFsEx2rKcyE2t/eQdzalc/b3yRipW7y0AFxUgJ3qbBU0YIzqQYu4G1oNjou6qfrWGxK+SDTTac34Bs1xA0p9+F8L2Ea8+1vwG6WQQg3480UmMw26Zzn14a8oBcSLHcaQzZia1IVZnOxkIxeQhEjxVz/hyNSB+i1NtDaRiJ34fTS8hRbA9NKks6ncmC77n24CzNod2D8Vdqk2FE5bBwLswc0Xxkvxq5Nbr13l+VSvHsLgmBU4zO65+Hmo7Sts9XIOD5Y7K65IRJur/XZrfdF8H7Eed5e7EVB8EtuaazB2ZL8vwiK4vhrGQLChCTCYGRFgIrDrWc1iD5Cu3OELKHT4QJSs7o+ppy6 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: dK5kHmExzgaLywKl4Vxf19Xf9qUUL4RLq8Om3Nm9GdeO2zXeglZad7kd15Z7XyRdxMUeSfpJY3g+RBFurJEx0LWY3QySKK7dv8PgcPr9aXY4L7/ttEhfkPxcPXFj6da0Ek4WCzs8CDxwLBGjWUYc4g== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 16ae4086-8e12-4c7f-f846-08d9888eb1a7 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:09.6604 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NyC3ATcVXYju 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,