From patchwork Sun Oct 8 22:16:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp1095107pzb; Sun, 8 Oct 2023 15:15:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTT2dlKpk4IWz0PDTjtr3/v/crQc8JPVZ6ph7g3jBXweN4TAEe7PUYWfWYhDSjUQA6SqSk X-Received: by 2002:aa7:c6c4:0:b0:532:ec54:bfff with SMTP id b4-20020aa7c6c4000000b00532ec54bfffmr12128855eds.16.1696803339771; Sun, 08 Oct 2023 15:15:39 -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 b21-20020aa7cd15000000b005347c0a5baasi3635777edw.66.2023.10.08.15.15.39; Sun, 08 Oct 2023 15:15:39 -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=D3t2z0Sn; 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 5131A68C9D7; Mon, 9 Oct 2023 01:15:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2095.outbound.protection.outlook.com [40.92.74.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2908868C87F for ; Mon, 9 Oct 2023 01:15:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g+hT8qCtxTQYJLPGFs5O9apXkmg0YGxQDPLRdd0XaV89tx0fSfSDXaPj6+vmKeteNGeyarmy9Cp7atkYHYllJDY4xFlESwKwu1BB5swjI343npzFYb+3qwnOF5g7ef6tkqke9Ytw4KplCXvkAxcOAcFOmH+osfGHAqHn5dGXUUklIa1N/YiNY5gZvx0ZZICeBKgXxXnfVUb2L9AFsV+RU38Q0lSuTP/EQi+NF7d0V4mLQdnboqe54WIOpt4SH3xCU87sl0OwImiW6JEBIiXlzqT20OLyPOjKHv90IaOIeoSTi4dmeNOnh5MfcFHJ3BoRIKhejZ/DhfGJDaka68QY9w== 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=I7p0N+1gJxxOL7pL/ddeDsJ3K5Kq7Gveds2JYnoMzbg=; b=SAMW2SltSlzbjmYllD69EBLAwdWriVK8OeybUAaRR8Rb2xpZkbmP7uyh5fDRUIDcLEsPhRFJM0f13S8D0YCVwS+DJPM7FCMoS/Ke/eOm2AXNAbECPQyU2w1eGLLkIffLjOBW2PwISFBLdu5lTVokZFq5JeECPPOKUusSLGmUg3FizW8L9ttVqwvZK4B382mMcyDb+04GrTMX3LlOVUXKQHkm4mtnjcwFPocFgGxg6796axEkAXUduJrma5mNG0zKsCKz3+rFxxrai92ymHwCD+x0YncAY1LAI0uMt+gI/U+MP7UeeYEVbBb6gaxymUqGWxNV3+mh15KMLVKktye99w== 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=I7p0N+1gJxxOL7pL/ddeDsJ3K5Kq7Gveds2JYnoMzbg=; b=D3t2z0Sn7u/bPSUrI1rQNWGKrmPTFB3a60VPVsPVN6ERuUxbWhoIdQojxngoa3pBx+btOywpgQGs0EKgaAo+rNF15zDKQeuJQ+bOcNYk5OzwOWavg8Dwcgnq4pcrCgMPpCUlh/xOG+FufbpCQ7AZ+gHiNwILI9DtPqTGyt9Q3WpjaI/hqbzntHITCwscvN0TDCYF3LOQNaHWcAa0hTAN8Woemi6BpA0wcXts3XkokFjuniwi9iv6HQum6qxjFelKQ8uI2ScbfPDQNupC1gLVabcAahQL53j4ynDr5kWBbuhNgqVZcFmtRBeFqdnzPBimaLsRPQCFkug7k08rBPeGeA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0337.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.41; Sun, 8 Oct 2023 22:15:27 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::3126:4823:194e:6f86]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::3126:4823:194e:6f86%4]) with mapi id 15.20.6838.040; Sun, 8 Oct 2023 22:15:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Oct 2023 00:16:35 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [Zdm5heLiaq1aygh53+re9aG81DSZz3Vn] X-ClientProxiedBy: ZR0P278CA0090.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231008221635.3900250-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0337:EE_ X-MS-Office365-Filtering-Correlation-Id: a1d10bbe-d3c0-4e26-7426-08dbc84c12e1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dmgMc8GJhVkBKmn6aVZ9DxSXJcWs2zm/V4cHo+F5knD8MpQYbAA/SFiZ4F6S/2BmD03U1QrS2lmj+i+hlgEumdSLBKREhp3V9nMDx8GPyFY5HE1Hf5gIsXyeNkxAXS0ew9ZhkQq1TZlSuqOftlmlvw/mN3P0DvO6OygMMlXJW+q7Xa/tW1G2mzdpsTobnYhTcISXPkL0JfOFX8hcYoZYcZtelWGjyV54K9MGDV9OYUe/mzJ+ULYkYDguvvyATK0rLJHOtDCw6D7qalIF8SYrO5fCytYIoO2xRQzhgwoJjHHBhS6gBJqAdtTxNtXDEEUyBZRRsggNhH3idruR8aFr7Sc9tXJFqp3orBFb8y/E64YcC4xFdeorRVQK4w5STKMU+Z1rrRPDuRXvSeD/2CBsCizes9KLogd3Sw4fnYufBXDbyyP5z70oMspSyLunpo6QnlzH0rdo+hc/0BZXcOey0MXWk5qlHR+y3vrNt2AM9EeB8vWh9l+nEN0NFY7q7cCEqbFT11+Hg3TKtFkCCl51hu2ZMaSUgWa3a+zkR+zkHEp97SJaVD5PtbLB6JH94n33vsnlnfpswxyUsBo/zsGHs/xGqCYV6+ExeN5GzfjR60OZxXYke6Zlqe1HInRN0O6j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xTPuhdI401W5ZyW2oLaMYm2TAcGFQ0KCRoRNXOYfcUOPR7oao4BPnLFbATGhFVvSdFsx/w8T7IFhpLPsaos//+FbwMsqOM2Aatc4aO/txj6zo+Zq94tZapogN0c9FJg0ZICitkTeb1fOTNNEQRAQHfpZfYt0ajk9w3JGullmtbynDtcrFipvvNAeW+JWI8KgWUAk0GCKJz3Nc1shzSOglD1JCu3dfdlTlNXHyckP69l3U9fYha4zJU1fJFrGhpsfb5BlvhPjkIkh4CAsdiZuBFtlsonmGPS2OhuE04YjWOEuMrCwwn/Rg5tAwdCLTJR6Eyrow7hAm4m8m9fyOcocaVEnG9YiwqfqRlDovXCAv4/f1PA8G13fm/NK8smQiZhKxEY7DVIpz918iB7+tOawqjnGmOwVQpVmzybwm8Pvw/gJv/4XdZlbKxxPII1Xplf4L9o9B5nkWDoJVfY8w1DrK8AykpNUXFmMVHFotuuZ55UYB5mHcgqpoogDkpEleNJgGpKkoEzPZrsnyM+L4N+f90sRpraJhzbRjqaPPRs4Eq8hV3xNwvSAZlJPnvHinG5v3kodiNP+zCFcacm6u0AaUUdB7TDh2KWoLGAkVKzbBro8F7tPqlxNVQmKjBWclZ7RAuH6sZcr3KaWItbNABqFW/KNEoN9QrVke4gmsUeNA1HSQRxSqIJV2YmdOrcrWw9RFDfCdLrjuHXuxuFBNmJ1SLAzmifNYZxAdfDymNh/PUl7yh+YXz8mgLaunYQdHE61jzLtkZdYM1upPTrX2WgxvmJKpxnFJeDNB/wMqeA220P8v+U4o7//KXLSTkb8km6ruXNQWNxlehYFYBi8Edh3h8FKu0xCUb96iT4ZXBaYdS9rgiYedvnjvzhuTouTA/kMZBBeDt1mMlHu2j6nYPG6s/R2ifkzS1MC+OrmcbfF5TyiFJHoZnf9HePqyV/bLn1ZpkCXxHi5w3GwvTawkK1rPLQ9IHzhAWZlp43zHTJdWkl8sWtN8gJA7qCe3j427fn8fJjbuvXHSRDsq4jaT14I8sBL9DIT/KgQMyEiKQF5EU29xxUMswAwtE76zmnIlpmKVqc56PqepZWvGT3mrR3hwDT9M8gF+zlm6Z8YYPMJ9ioUjRtC+ub+ua5sZ8V1yzdBDrRy1zWpwhW0eheQ9KrWki64IvTJWRubUf++mAMBE+ULW9Czr+Js9gMY1VaJdFpnTItPv17Bt9N1xv0+kSRufHl4TecbqMZB2il30yJlwQMb0isp/eEI1W+uMWuv+bOF X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1d10bbe-d3c0-4e26-7426-08dbc84c12e1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2023 22:15:27.5478 (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: PR3P250MB0337 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec, mov: Fix declaration-after-statement warnings 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: QoelrbF0UBgn Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 5 ++--- libavformat/mov.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index af0e5d7c0b..8f000f86be 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -4542,14 +4542,13 @@ static int64_t webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t int64_t pre_bytes, pre_ns; double pre_sec, prebuffer, bits_per_second; CueDesc desc_beg = get_cue_desc(s, time_ns, cues_start); + // Start with the first Cue. + CueDesc desc_end = desc_beg; if (time_ns > INT64_MAX - prebuffer_ns) return -1; prebuffered_ns = time_ns + prebuffer_ns; - // Start with the first Cue. - CueDesc desc_end = desc_beg; - // Figure out how much data we have downloaded for the prebuffer. This will // be used later to adjust the bits per sample to try. while (desc_end.start_time_ns != -1 && desc_end.end_time_ns < prebuffered_ns) { diff --git a/libavformat/mov.c b/libavformat/mov.c index 1bd224f390..2f29487beb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4903,9 +4903,9 @@ static int avif_add_stream(MOVContext *c, int item_id) { MOVStreamContext *sc; AVStream *st; + int item_index = -1; if (c->fc->nb_streams) return AVERROR_INVALIDDATA; - int item_index = -1; for (int i = 0; i < c->avif_info_size; i++) if (c->avif_info[i].item_id == item_id) { item_index = i;