From patchwork Fri Aug 27 14:27:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29825 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1513623iov; Fri, 27 Aug 2021 07:30:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzu50oeixrXdm+MKlFrfAbj6f1SXnxADQNAoSTYgfMbK/+pK4gkZGG6nyVPwDrcL35gTFlw X-Received: by 2002:aa7:c245:: with SMTP id y5mr4724838edo.20.1630074603926; Fri, 27 Aug 2021 07:30:03 -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 y5si6745955edc.227.2021.08.27.07.30.03; Fri, 27 Aug 2021 07:30:03 -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=vDjQPVnx; 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 CC89E68A36E; Fri, 27 Aug 2021 17:28:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064097.outbound.protection.outlook.com [40.92.64.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82CED6809E0 for ; Fri, 27 Aug 2021 17:27:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QoluT0QV9ZmHzaV3Y5Kg1uRN6Nf+aOL6U3VvtWAR29AU4BIOa8MIUaD2U+Vjqa3fjk2tiyEXcisDP10fP7f6CS0bRQVZ5Aj7qXWM6z5RFp05yEREDZMserWnZCeWIrBls5BBDot1MRESRAE09ma2QZPyHY/oBGSRydVU0uz+vqp64Fmm3lpp8Dj8Vc7VX83g5+lgZpY/P4jxHUhBl1TLcTKWTk5wM5w2NBOf/lYVHg97LFQo98NsbwcKcKRnT2AoxsXuNv8+VjZcaY/2ZG/bvKs3PuDTtNgDUs2ptG2Aracum0eZaNEAMYW59G+iJ5ASm7AM6v9liOqXGp0Im98L6Q== 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-SenderADCheck; bh=qHlXVUovbPspIUCDJ17oukDeUtBecOmqhkIB097Cyx8=; b=TFuCMimKaH78o+E03DHE/S1zv41LGFv+X8TXG9BMa7zK66aOeoRIP+vhd6AklPRuxVTc0oWq9LP0ysBl2xrlSytWqgelArnYQMQYVcEgM1wh8JbVz9kL6wf1EZYcZgIh56+lkvwyBZ8GCG9SwPyJ8t67huuHirh8E0fXF9Bj5evQlJUY4/nztjCMT1oAdXJpg1+CIcwl1C39K8nZcUenyakrcnaY1WunHHZmBBvsXdEh4FyeiiYDAGni5WtJudbPfY9EvxnabqHFJndHnk+RusdNcIcWWu4BEbyN30BBPVFZKi/lxP0GiE2h02OlySFSI+h14Qs0vbvWuNv2c98CMQ== 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=qHlXVUovbPspIUCDJ17oukDeUtBecOmqhkIB097Cyx8=; b=vDjQPVnxJhhybJW93v8KJCeuCCCO7UIHicHR82bRMg+3U03mJ+avNxIozOP0VLu8Q1xzQdp/lKWM6k6oYMGyDkA7IT9qQXVMzGxxpu38lQFEYiR58axgT8drJ7uQtQL/wnW81IQrUEpEFdv0A9dGXFw7YmKEcN+ecWpb/yJS2esUuNIHvH3AfWEgBME7ERLnvGODCBbr0p+JAChUDs9YUQj7pmOBOd9hM7XoeohZ1h1cuEnpSgvBl+eIII72oyEYm9/YdgZn+kIT7bH5Fhtz8OqK8abpPwTo+UO24G82NDn2N10sR5F1BL8DGqE7MYNrP2VBFg1NMhYjSPi4z+COeg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4824.eurprd03.prod.outlook.com (2603:10a6:20b:84::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.18; Fri, 27 Aug 2021 14:27:55 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.027; Fri, 27 Aug 2021 14:27:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:27:17 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [cT4bzdbaQvzGr02zjEOKkTUqifwUYV41] X-ClientProxiedBy: FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210827142725.645653-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Fri, 27 Aug 2021 14:27:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 020fdbc2-a9e4-428e-7bc8-08d96966dc21 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQnUOrjuXD0ZUxXZpiaS0/7vzheLA1AAf52xcU0SWAMTsZpl2ScDbgAp11I6Ke8eT3dW50Ztab1gf02kRz5Wx7s1QidofBnsWJwX7HbLQ7ult6xR6CDlXTnGxVr0aN0ISzMg8Bae9Sjg8A+tWiUc/q/8bbqQlv/89Qsi5kubUGGuoW8rXGXTkXpQYhcGGcXO6a2MA+pr9erAqQauBnEdnX8Gm4XVQ8q8moRflg7a56frUM5vW4yrpSR2tQ8jT1NWqC0XiT890PmmlCNTJKu3Jz2J7LVVsKYd1yLhCzMRV/9AKcS5X6314F73SpDROw+y5Ug55jeX0pygSf4gkPC1j/fpfwHfV7OiwB6dxiL+7f1sKLsD5tQBYD+TmdlES4mCf/z4vxrIYQ4SKTu/ehmO44H0/f6p00Lm2xlUv6avejM7SSsUl6AHJQ2TPO2SrItr/MMo9o5y+yDQ6zEoEcu/pAKng1B+iqh9dB+Q4Vi+8sWEx/ctfLUd2ICP46o/vcu7oqZ1mCMv2C/sychS0oLsiJoXTmu0JfAptw8q1W6nhxQCdxmuoeJZVb6fUMOl5O/NQY8f1LMNl94KtJdfrRuL/qtJgo/lS6MkKBnrhcrFglJLcF+KKTzZrAbdYr4eaSLaqI1Bvvtsr2OzMzsYoFfTnZlEeVNPIDE5Cs1p5rKK1WXWiStsC0edro5xUQJNaXzZcPyjHtdxxYHwwwfkXmEnOkPUlkHr1nbjzTPnsDBNQGyfXGQrqT0qhqJQ8aXAWZH7X0= X-MS-TrafficTypeDiagnostic: AM6PR03MB4824: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sY2wjnJqit/+7d4IkAAOFLve0o3oqVIcRGQq/YwjEWMlnR5HLjz4iExx63HPgmmcclf0IU4L0oUfBgdtJbhOXjrrxrjiVHwmnOI6XUDr9X/72Z9VN9AHj97n8zMRKXLjCrmHAntlnx0OsTaorcS5UUWJBgAu3mOjJiDBgUtvVXG97JTKrhF/p/XquGIhlqzmmzml7H7sAJfKlGVyKDP9u77M6lLJrSN6QropOeUsSD+j6f137KFUzPWAA5ZXK/gtpJwHYPqKPj5kJUQ4Gn171JCrFuqom/FBS/vLgk7mGjhhPk1/NObKfKyWj7b507hs+YUTCJcrOKRPeWeDiuzrXU+rxG/QmThZ5U8jFWzwaIFXDfDMv+8BIZKMTSPS8N0YJwJ3CmjuquXUErULioUeBWdWwZCvSB/X5zjaVm2hzPw+JbvYk1lgPHP/nStGfOXE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jZRfsLsSV7DldQxSsQiuzAAJiuELfSX8fkoqXstKh0MpOD8vkUuEJI1Z/N7jzaLdPUheVGUD/MEqsiUpxQtNg5YEiEmfBlRavojFfeM+tWg49FQu4nZzQUznZYmwMZiRohHTO4BXRFtgbavkXo9JgQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 020fdbc2-a9e4-428e-7bc8-08d96966dc21 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 14:27:55.3016 (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: AM6PR03MB4824 Subject: [FFmpeg-devel] [PATCH 17/25] avformat/utils: Use av_memdup to duplicate array of AVChapter * 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: BfLsTedSzCzz Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index b3ff9e95eb..b56190d2da 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3176,12 +3176,9 @@ static int compute_chapters_end(AVFormatContext *s) max_time = s->duration + ((s->start_time == AV_NOPTS_VALUE) ? 0 : s->start_time); - timetable = av_malloc(s->nb_chapters * sizeof(*timetable)); + timetable = av_memdup(s->chapters, s->nb_chapters * sizeof(*timetable)); if (!timetable) return AVERROR(ENOMEM); - - for (i = 0; i < s->nb_chapters; i++) - timetable[i] = s->chapters[i]; qsort(timetable, s->nb_chapters, sizeof(*timetable), chapter_start_cmp); for (i = 0; i < s->nb_chapters; i++)