From patchwork Sat Jul 29 16:00:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7927:b0:130:ccc6:6c4b with SMTP id b39csp1407339pzg; Sat, 29 Jul 2023 08:59:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlFi/23eKTEKxLoPrkC3ltaXi+8ENJZ1xnDTefvkBsoJffVlRsauDxcUh66fq5mxxWjrRPel X-Received: by 2002:adf:df02:0:b0:316:f3cf:6f12 with SMTP id y2-20020adfdf02000000b00316f3cf6f12mr4404747wrl.48.1690646356275; Sat, 29 Jul 2023 08:59:16 -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 g15-20020a056402180f00b0052280c8be71si4180705edy.530.2023.07.29.08.59.14; Sat, 29 Jul 2023 08:59:16 -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=@outlook.com header.s=selector1 header.b=dhJfIH6R; 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 6480468C76A; Sat, 29 Jul 2023 18:59:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2067.outbound.protection.outlook.com [40.92.90.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C77A668C558 for ; Sat, 29 Jul 2023 18:59:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l3BwPYDMowXvUtDg95WthqcDsIBc1rT4HFNkRa9NWqT+TIztwYm4TrB91xbJSZ5zdoFjbXoWb0sm45ltgdgF0uese2bzFT1qIITRiIRr1FVHYiuUfJFh8AZYPA0TR+gBFCBRoI23UBKtyDYuglfXWmEClPxda0mTP0LGgkRmA5A+XfWTj+A0muFGFixqTTHG7mgAtaOSjcSJhj42EHnlLKYgfVZISWKCJkZiM0mi0ccuh98ElHYT7SinvuNQHysSC6js7tyWZbtQw7xq45v0sm0+6u4CaerSf7GQ5fAK5OiZ5YkMBr5Eurql7+kXJsop2ErL6FZXketGtYQ0pYL76w== 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=NcMt4Cu+pZCqGW3i+ZQz8Zyrj7HuEU4yBmV6TkckL+I=; b=RD908gCrt36m5k8RX1xgZIUHqRwynX0F5fUCvXgLJROTX/idnpIh/Holm6IsrARTdu1D5H8VtJLkAZLXboGf4GyS0dS/GfYgttTP4Jzg/l98zUW32xlawDN2e7ZquXtOsL43sii5cfrOqyCXnqaX06U3ubfP5FixdVnsgmhbKJZrmslXSfe9iAqAJ2u8ryqL4iBK0epKvNb9UKsl5G+8xBVrN/nx1u7ZQUeU35Q70LeadQfl3ABTOUemaVi5dKNZbBG6lw19beSamA+zMrQjdMxiX1a3Jk5L1b5hRVlG3gktj7o1QLrPcoh1x8huiGUrKY1JW+v+I5BX3PjX98AoTA== 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=NcMt4Cu+pZCqGW3i+ZQz8Zyrj7HuEU4yBmV6TkckL+I=; b=dhJfIH6RkFmOgFmHmGUWgyXzP5sPeGomuxreNdx11hb1mf4VwnWoHLGtAM9bdyJLip3OuuVd17iwK6zUh9SvKXa4G/NHqnHbEgAzWCDuu9DF6Bx0FgMA+lEGTLLMAQcjqpfRuyAaAYwt7lYg4WHSuCOBktvDbOTSjoNaU6XBxwMm0Itzggzap/3XYd8wouLjIPgkS/599hDys17f8dvc86bEgGaYaImjpKMFEep5Vj3MATpzPCZtZ2FmEmxGxCM9GDQl3oxvmz9qM9/LP7y26Wdmi7UWSekiJ7Q1zvNx5dmnwtdWY5Ab2T3FILhZqMv56Sz3Idgc5/VT4lH0ZMOIZA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PRAP250MB0417.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:29d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Sat, 29 Jul 2023 15:59:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.039; Sat, 29 Jul 2023 15:59:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Jul 2023 18:00:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [U5AvBGX37eNaW0nghdWHsJd62V56Fxjd6GliW8NoDFs=] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230729160005.2598389-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PRAP250MB0417:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e3baefd-a2a1-4869-70c0-08db904cbab5 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmq7Fw9O5yJ37OdPEngde1iQWhLpDTV2/Qd8KqR2pOgEY8CurV51oYiBeAmjPcnT2gQpkJtebTSfQ0WaZrQtP8C5k5lO6zmXZiuT6g2a82+efDdKon5PTbjjXlrTBHMWZMsoprV4vJ6ZW8N6nwqwp8Wk+KAC+VxmoJliIe6XekWvnS+PlbRell3KS0FOSstMuyZPImSRPj8kirBCOrbhVvVRxOTWpRX41K0Ne6FbJnbIAG/NDszOpi/0Ssz4ATPdqmm3wzcUbzO41oHBk545NHQDOkTOnPKy9TV6+qFjsTEuvGNRPOJ3MyYC1lrAsEue3TqYzGHui66Ssmq1+hrVQilxrdUgTGYm3kk9uVigvoDIWMFJq6nOPK75PGvVETlxuVPsxxYwpKArwJ+mdnCOy37bUDbKAJ3B44R46GlIeP5sRPGF4atsdzZtEcnc8h8vatKCx3cYi2NYZ5msB/TbgBLKfYi1HlY11IrF3agG/SENneknhDCNmTaDxwCtq5FAT2CgtxOgxEKZnxl4kADeq2X3T4XK9PCV4MiBWVS5Ojrs4Pvcd1vr96obcMUWKzsDG9wL3XugpCUzusb6ej/54c41Rq782OPqC1oP18J3d9QipVSrX9Qiy9v327+Hr1G6de+GMBoPk0B9BeXQ1JtOgZDyGUgUuf0eRn/o5xCoe9Z3tTlkuN+ggfHgoWwZ/eDwK3oqISv99R44jps6C5okJGz0LQgJgJfKoOlZS9Pw86AQSVZRrN9/eETaNAcAZyAz6dI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kDhptOjYZNHEUb907QBh6YE8XjbR8QWubdw2dd0/78b/osclEGN210biF7ttPhu7LHWmeniVWIDyQyiGqu0DJ9DHifn5ZjSq9OdvAIN/XddTOTUFIkzMSc4V5ndCf74sX/0wf3U+osdTR5K04uUyCzQepUe574qXob+a6ktuSv1WSu69Q6NDpm9uBsxyXQ52TzQGztRFip8VQMENTe4SKCY8luSn1mvCBeLGwCgxZEoJjg4oOs6mFUkVsMH0g6KBsRkRl1tsM3fOl1YWMSuXsAkqKghNE8B+yTKru+ELKcgPKvRuwf6Rs2t/igV0fpFr2suEmDjk+Bk8cj3dPb+37KFCZsE8CQMNl6SM/rxax8MDYhq9kgwNLJxfggaH/v3mGNNCs5DvmZV595Lu7n9Ooak/EAolwtJnlukpqy/AVk6XEnllgWovJH1cQc2uh3h49yrUQmoywakMYX6W9jbOSYFnELatlOrqPpUsZ6wNzDGBMHrzl9kA+Uan0hksBAQClA5D4j72s3x62PE4r0C6dDELtDG/WJpRIqL4HRfZVdkBDtDG8hyFN2NjzJQmUg38TyG7qSqWk1oRGZALT2RAK0maD6IOIS/1uCkicZ79w+ZSJIuQfW2vx59iLP36yobL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gYsKBIqhRe+wbQz3Bl1ADnc3xwW76Rm2f2dT4SM5x76ZvdM9qtaeFnBpNYwYYS+ExILY7No0Lk9+43LQyF2twZGRMZ7wgCKuEuHeRW3rDoWtR0lCqIthSXeJFVd3s43ljkyJ69mZo78Nj2R2SQ9jBnfqBygn2JfqGtxNu+2ygr4IQnUphRKUJBa3tF0cKBX3q2pNupAgrbpToKqLYZIFMs5Z8ZaZ8pUn1Wbd2WYAKFAiMFStarLyehaX4MM8ny66qzHm1oySZKusNjhRA3aqW3SUeBQQ965bb7gYk4jilfsjjL+1Uer9bVO/VCHKe7PTRT5nBNeeLaGWiIgvux3zXGKRJzGAU+td3myEnJU4lRC+sm65umqPNEhqYpFrGd0E/TbSWnAqEjR7a9OxOT1mfAcSm1t/Ek4owzYmpPlvjocndA75XaphdB9XE48tNJRf6Um7GlkswKVLITHAHjtZnFDphWgIVinkN69GaPgPzBNpHdN5kU7RP10JvJFk09varbLa4Gm+3U4L2fIrC411z3RZGMFhFPtIXeOwrdg/3hXhiWZOw4LqW30Ju1AOiNmpIJz7VNjbDQUEUNo9ZHgkrkdm76TUYY/TYtV/u6wpc14eEOUXfE68KFfU/GsgosBoFgrl/g0mcWkmL4HIPxAqOqlWfiVue4D38UtzCkaLliRIbRBKDMwbAxYKbHQ1O6Z9JurULsksp5OOBTuUAn1CQY55dc+W6NTB/Rk9a4EUffHmXKmggtiWnJ+y0Hp0kyFiMsvDVeSvE5uiKGBVfT8M7m2maIdHm1Fe/CcJuM29aJMAX0wpUZGupbcouV66yD1qfqo+lU5z9+7jz0ZgA0QEm1Fx8477MwjDZMxyeEFfYChopyO2DDrQcHqvKQBuVrI32D9K+z7BozZiKVFRs2ibMudwS5goQRNLsY87BwihN53IWChjCe0SmR8mfzSjYFMl14QjL9EerrXOSpOwXplWGCaMZ29Q5Qe4vSx6aC90Rs5ePXRVMNfDSHZbw8chum4qaQ76xnJizug08leLEbqTlNLiLblSIX/Wmz81FIVCcQ0ZMI4RxBb16gOkgP2D2X4lZLUeKKa0kXyk2ZR7+YyCE+VEAnIyRrpEFw/uARwZ+yw9FfTdXGEfagFNKJybjOZUoYnzP6jPmBDm2PvgkYb+HVlGra05IYzeAHOLsxcnwDQa9tV7itfMat4II6JIveUXCXg4Zun3S6/bvhF0e2b1cGuBD+X6gl712VDGUvxysk8oyTW3v8YvkZyAAE80JZ/U X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e3baefd-a2a1-4869-70c0-08db904cbab5 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2023 15:59:03.0958 (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: PRAP250MB0417 Subject: [FFmpeg-devel] [PATCH] avformat/lrcdec: Fix declaration-after-statement warning 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: yfrQu83ggmR2 Happens since c0f867bf503e79eba8ee52e1ac53322f88ec2929. Signed-off-by: Andreas Rheinhardt --- Will apply this soon. libavformat/lrcdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/lrcdec.c b/libavformat/lrcdec.c index 83bb4a4b75..f43e9dccf5 100644 --- a/libavformat/lrcdec.c +++ b/libavformat/lrcdec.c @@ -170,10 +170,11 @@ static int lrc_read_header(AVFormatContext *s) av_bprint_init(&line, 0, AV_BPRINT_SIZE_UNLIMITED); while(!avio_feof(s->pb)) { - int64_t pos = read_line(&line, s->pb); + int64_t header_offset, pos = read_line(&line, s->pb); + if (!av_bprint_is_complete(&line)) goto err_nomem_out; - int64_t header_offset = find_header(line.str); + header_offset = find_header(line.str); if(header_offset >= 0) { char *comma_offset = strchr(line.str, ':'); if(comma_offset) {