From patchwork Mon Dec 6 01:12:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3912701iog; Sun, 5 Dec 2021 17:13:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3LDnxGkzYYqglApT69wkWVUUvIYlQoowgP0wIhjvZO0pZaorUk6tRUmd8Ym+/qlY5ghhn X-Received: by 2002:a17:907:6d99:: with SMTP id sb25mr43947200ejc.261.1638753187756; Sun, 05 Dec 2021 17:13:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ho36si17664599ejc.607.2021.12.05.17.13.07; Sun, 05 Dec 2021 17:13:07 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=gV5jwn6k; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCFFD689738; Mon, 6 Dec 2021 03:13:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074036.outbound.protection.outlook.com [40.92.74.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50AF4680CB2 for ; Mon, 6 Dec 2021 03:12:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=de8X8uB/IujiLd3zjtynezZARt6J2jBUSCyhqLmTu2rRBRBY5zpATOQXe7talNuwCFKvhAPBBYPuCbBxPybH+dtCWNtRiBA+VCDwgVO4R8cVzVpF5eIciVorIWiCcOlFLxsL/6rf4uJn/bUqcbZI19FXmw37Gh20/Sm75cYLhEh/6jNxcqaZN0ptOdViyhDKbB1ty1FU2IScltXPyDJBzwOrYuIuM5y/Gj8/I6AXYuUcA/+FUbJ/gqwy24U5lU3EaWivHBFL9UUb+KMeRWffS4OgzrRxwPfaxQ+RWZoMsBLC83J1MdvwiXE6GTHuD4OjBpgL8PBieyCpczjq8vF2FA== 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=A/hD6G4Vp0wLPbBWu/q48rIXfhXqgMPCx+P568BuEGA=; b=lp/qTjdeeCUuLkZ0g9keRYRwP4cY9WBJ7RC2e5/1r8Da8aTvH98k4apDxrU9Rb3G0R5uO2vhFXWfExJO2cAVaUGIx8MaNWeFJ7DLs1B3n9xKlptAhqsEvh6Kpj6WCLRsFxcyypsMirZMTEFM89CPsTYYxUsIZMQIpj32Sw3qgzUQh8Xir5xaq3wjvfhC/YAvJQkx+W1Nl8wWq4hlYKc6alOW7BL+A07Bv67Np4CcehJg87P/YnqfRp6IDANEgHh57SGviDwKyCKcZoDFqD2DbUettLbbnbKBg2Uq3osXsS1prB/t7XvEbV3ptahwRi8sSx7b0qqSbubkbFT6d4jU2A== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A/hD6G4Vp0wLPbBWu/q48rIXfhXqgMPCx+P568BuEGA=; b=gV5jwn6k1PHMnmJheS5Zxk4X9HHr5ulI5Ild4iiE/VenKs4QlE0zK94yfw5wzijIXbU9EiAXuX80pomUXDQKQ3zqWXtlzx4osVEd61HRJVrmcj4q3jeWWwgcr+nVeBiRz0qMH3F0CtKwDfdQECeFGmLtAQz/NMkceKhv248HmP204UI8s9HAbdEnzLkrQjguw1E0ug9IfJr1ggALcEowQESLpnx3BaN4KEqN5EAGCMcbtGNFte28z34uGfVWvx8Nuy4X9K/uy8dszNPBo4MzaRh4SapRj3mP6Utkd0hXRUW9JOJuJSh0chibDPDmmZ7koPlukd6rbYxJT2QuDXUPKQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3686.eurprd03.prod.outlook.com (2603:10a6:209:2d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Mon, 6 Dec 2021 01:12:55 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.021; Mon, 6 Dec 2021 01:12:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:38 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VDYDiutWln9m1FlTh/hMud7pRTqLEe/Z] X-ClientProxiedBy: FR3P281CA0055.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211206011246.239514-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by FR3P281CA0055.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Mon, 6 Dec 2021 01:12:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18e71eb3-7199-4044-707d-08d9b85588a1 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWqLpJmXNddFmQxwc0tuI0laMFlS8gmJmRXP7WcTZVf1QDWUiabCYT2lzTZ90K87dBpqRJWW1JLowJ+4lqyWeEXWp3dCVF4zEr91DNAWjitJMIiWxojrKUr2vMal7/0mwO9zKVg7jX6OomvmHtKSAFuF6XGOEZPa41MQMVe0DTXt3JDRpvpvzLROFfh2lkd7yWhtVoK/fvY5PriP2sTe492wXnwOgacFOiOjZJACWxGCyStziBtYq/s3Z3SZKk5QDFeOabEujXnVgZash9Cexw4pYomlXQTyDlaqh8BG0IJXiTjj7eBjNwjKyByZM7UUb4EFaA8OzrcQKMpozFfEJLNIuBoKMAUwlV1P2T0uZGS3HrcMWO/UnIQrmfOsU6xKJKjheZC29cPKqFVlzmbweLm8xI4XAUXbjmmVLAoS6lyGc2FTORiUdAfLlPwheC9hFD9FUp6GRZD4uqnPAQ45phSYriXyIhUBQwN/WB/VBcf6ZmrFNENKVihDZ8+xrcMvIZNj1S1r9DdHfUioyezL3qsB3ZNi7GKvW2ZYfJqoeiCEPKFP4db68qUwAPzzPTE7R7ChmqohbYCG1ELCrDvwpAK+O+yagDgeZMRue+Q1JXCywDuX3/LAIulRAkmodzfdB1Exe5L3byggvglpKslOU7/BoGgjIaGTw/LZ1aMfkAjPkXhESUzHs1xoisFL2KEGlpqz5RHoxjiyW/8fhiSp9aS2qBxhjw8QeE= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: evAlqmjDqzi7cHvSuOf8kiW52jNuv326Ws5H4dEqbNt+da0OPZ1q9/YEljNwxJRcrMVkLBWcxan7nGDetyMgS73EYHj6yi1KBSzSdMUGsUZIomnUWySyQ4KsIbCWrMYGoEuNskW1/1imiSfDexFRbODCx1l5G8Em1yPMOxItUIvhorwsGZrOIX31C4dLJO0XFIjWlsuSLUJtD7GMXwbQKeo6RLmHsYWmHg6C3881CzzoLcvU5Rbpay2FIJTgNyTFA+uGWVBO/nucXZY1uQaG1Eae8q4SceS+iSoPQMmTBw+hC1rw68FGjJAUPC+0+EhnTOMVGpm0t2hBQ7kpC33ira/sy9wrBfQdg7ULWsM19ZlcY8JHfp8+u3TRBJIvlW8qvLwDNsXk3A8glOPgbRaJ6MOrCvsh9wFgmJ3tEzvKD2sfMtr7Ur7r/5b1oEQI+wxZIhcybS1vFWlhPUVEwTzqvs2Ujl4DO4FIQYPDFKAzESzBIrplPyGlh1tjg+KXRyOgp0uL7r8OW1GULvd1LuA3Ppt9CgtpZKMcMYoAUH2Woxykb7QpiL/CjXLV6AV9Au48p7eC9NvwCCwM9QlmddOaZQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hC3oqKuf7Br97VIJ+xxapoLW0PebnWNUgZhXM5C1Ca1jVaWHTbh6Wc0hNZbecpxt55b42Hzz58GdKP1L/DWVLJ7tZ2c3y1V8qZodpgJYkjd59GVKy0ZD0RCcNu8vFUx782oRom6PmTVyoQvQ3vOsU4W5ekB/QnCDuWr7rV7hB8MxnfceWrVMK9+ttsKOOR1U7RM3uAyNE//FtqxLLbHp5vfBSAWANtKF7zPPpRHuP15Yeg3dYdDgt1HZALypyE/rFst7E4zN9l+BuT5wxfy9eRW+JxVpjGvSrinc8sj8yUXYm2QmU2P+qJpsX7+yVO/TkBKhetOocn6LNCQdPM2qPkSD0QnBYHJMNwX2L0iV/4UYiMoXoL1TfydWAGMnm/Gg2Q0O3kUBnDwafdfHwFsS3TOTNkeMVSMc+FV9513/+61wVn4i0HSh9Z/W06tVN3FhoI3UTjFNxuXpU6c0PVIBXr1y+VJmtTcx6VfaawDmWzWa9sMTMCPlsSwp5EjAGcWSOf5IYyZ/OWMgL22cQbDn0/Bei3VG4MVsiDLmogw6ME6L0IM1YmsG6BmgmQmHS11+hl0iPu4krjgi3fQACFO1sh4py7I098qC1+MgYs9voGSF4o4aWyNAix3lV6k4GfMrnkyp9rCtKJVwaFGwvTsYrU3hkSkD/rxqxiY+yOEdqLR2kGJdZz3cuesxgrt0iEgwWXqTLxSJN3g3z4l16pHRvlQr3EQrrwGAw7oz1a0PwZ2rws1IhxJBvLZth9jOALwkgSzTDu1gloAXF0deUFoMQ+FoAJV3J0kQhH648Y4afNyIZIedaIqdkv7DyRzFMdeGRKqD1+yaQziJDQ6MEMVS+PcbsdzuLJIpRNWrQlcHGoD7Igc89n2JsnM+r0BrbLt1Jf8YTSDoMANR8/MPdghh8xg99YSm9rLI8StW5F8BJ8BeFgXUfqx4LYxc1XX4gnXkv+znqXHdOldrH1PbLllvqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18e71eb3-7199-4044-707d-08d9b85588a1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2021 01:12:55.7252 (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: AM6PR03MB3686 Subject: [FFmpeg-devel] [PATCH 02/10] avformat/aadec: Don't use the same loop counter in inner and outer loop 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: L8wq9R8seyQq Due to this bush.aa (from the FATE suite) exported garbage metadata with key "_040930". Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 72f4b6f7cc..a3a7664469 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -132,8 +132,8 @@ static int aa_read_header(AVFormatContext *s) AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE! } av_log(s, AV_LOG_DEBUG, "Processed HeaderKey is "); - for (i = 0; i < 16; i++) - av_log(s, AV_LOG_DEBUG, "%02x", header_key[i]); + for (int j = 0; j < 16; j++) + av_log(s, AV_LOG_DEBUG, "%02x", header_key[j]); av_log(s, AV_LOG_DEBUG, "\n"); } else { av_dict_set(&s->metadata, key, val, 0);