From patchwork Mon Sep 6 02:27:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3374040iov; Sun, 5 Sep 2021 19:30:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5vX/FBU/OioRRsZWJsnLFMXWir806BB26iEUzj3pGxIM6/0mDIJF6ZnWusek7nh2aW4v1 X-Received: by 2002:a17:907:766e:: with SMTP id kk14mr11222367ejc.339.1630895413329; Sun, 05 Sep 2021 19:30:13 -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 s14si6782095ejm.60.2021.09.05.19.30.13; Sun, 05 Sep 2021 19:30:13 -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=dstWL6i3; 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 9E7B668A852; Mon, 6 Sep 2021 05:28:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066075.outbound.protection.outlook.com [40.92.66.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8326F68A7B4 for ; Mon, 6 Sep 2021 05:28:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIzzFA8btmmPhFhkoP4UGYwnWn/EKQDw4IhGTLCDfCE7CtZ9xxpKjEy6GQUOUaj1nFwhRVTcJMXq+6mlAFDSmUwRxMqUmmHcEh3l+gngb/M/eyslwnRF7ASfOEDQt/wAINMhkBTw0RKCM6YZYhYZDzs/QBDgIgANrqsOmS0da+FfWCTN1hIaHdc4vzLjUeGlWrFNjKu8XQGmib9RevmnP0E78AKu2T0DoD1/19BLmmPNUxawTTxApHqVNMUnFQMkmSF2+wjpSx2OIGfolOi6Iqzq7Z2it7qaJ2q3TpJsAUyO0a29PB67TtqBZD7xwQ+4wkzumH3RATom5ab1byP6cQ== 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; bh=yX9VcTrmmn+mt7tnNqRuk5F2LhL7+BuD15tNxFNHCtk=; b=EnQ/D+HJS8LFF6qw+1XYgAAsDvU+X3Ve4+tO3Lv+ijrCxuFSsxakU8tQxvAh7Dt20OC6e32TtTonMk4Xp05yaSppdMU1joTfZQpaqZeFeilrH0Wlrnvukk5/gATTV1K7gwBXuNSM4QdYuElU3woez9hAXp+aDe09vmAF4eHnrCYjrQxKJswem4inqOnp8ZQwqGAcpO7O5Xx0Msu+sku4St2DBMj727cucoQkY7lGS8F5Ir3uRK384dlXImAjIVmzIk+4MhyecbW6KQvNYHYxCbnGREW6+21iW60p38D1PJ+w+wtjCqsmMg0fVdRz74C7Q4u1xeiOiqETTKTRYhnlZw== 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=yX9VcTrmmn+mt7tnNqRuk5F2LhL7+BuD15tNxFNHCtk=; b=dstWL6i3dPFy9l/Yg+20ccdk+mVZfi4tkYDXOUI8KCv1PC3ja0FyiOu2KYK1G9jF8vrJOm9YFpHnCukbhvP39OjJ7pypBRoevuF0pwrIuczm6uE0txTGn6MCubP1B9L35ht+CUcNYfW4ynMn0mYCj8BV72ZEpn1TZIlK52tNH2Fkgx4KIx4cAgOZx8P3QUf697HIj0QjtgLmlKtS4QVklFn+V0AziOab2Z9y0x/ShTyzdJSmPzpW6b7Ananzu39f8Pt5iy2LQ7f6hxvuqIxYShH2foHJ2tumWc97dd/NjtpUnny+xp6AGMWc+TGmdaRF+r9FeDwfAWg8ScbZcYdy8Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.24; Mon, 6 Sep 2021 02:28:26 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 02:28:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:49 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [yvI3hkskL7hM/SKPVjoBhcWonKA0VQfF] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 02:28:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f00d5d4-7197-43e4-852e-08d970de01bf X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQPQD6tvsiQeosiZzDpp5hDV4UQJbbV5MfhNuNsXmLgnlAVBErXKAlo3tqRXgaZHBLLrAaS5ZSTTMjRuPqLw3dfi9MpYu2J0OYvd6B0lL0ZbM+E5NB2l4M04025T6kc+WU/c1CuLb5DDiT+43I/cDUfZsHycGihdXVrO1WfddEruEmHboRo67ntzit80A+hMW7hMq8AIjI6HytY3gHRZRHrDclnkKAIwn1pXD5EFUhZErWsPdm+ABFSlkUrBeLSifW7xPqyVAkiZ2kyY+gMfy8CuNjatDgGrT2VQTtfIumFz6yTRtJcvRnIE2RWxOdhZJ9z5rWGARXi4Yns4S8er7q279NKDq624tGze+FPPRwcYKi2QhESmjGrZnd4VWjqTYrv8kT/WrhbXU4LQjtUVDGo3QDyDMlOxQhlCQ8oBL/ReLS7cYhsKRb/NdjiYEO6f1Ck+t8qRrGrx8hJXU442QI+PIqdbzqWLFAEwTPTkBihZ9pop8ZU5tRSZfBs6VXF1gC9uTvd7nxX3GLhisPMPaGumCvd9VFp+QflNAUGfQpfnJoQBSJ0v2zuCjw3aPIYODhO0/KizUg3WfQ47iQSWgwQAOOByj24BBEJL2uOvYVk2RUWfzdU5CzWMngnt2v/8uttCg2TdJeVA2kSxIiM2O6HMhwa8PCWnKhukNgBirGa2Nnl+fOAJUOYbGVwBLOkoc5iSoZuu64VVsOlg5zDmkuQ0xvi+vBDIo1riAxKMC0LSF+ssjDG5JTSF7q3uDZMYYU= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cARe9zieV1pPopkEUeV4/VqXM//YZiMwxGPkIm5adwAHl/6Op0usVVi7J9ELcfYA2sMfAOxo61wO96E+rHxxSUB3bjAxQ03hiAz+ShjWPZvuU6ZrTe23FoDEPOFw26/5AVNjguUjDH45dhSvgdS5+K7ih9cgjUrJlfgogqeNZC/pTxx8n4pwbi7HFFzdtpEWV90+RUykPYf7Of8spKnAmJ3E8uz8jGHLI5n+SmH+66+0Bw/cMLENJmxJchIrnhxt9IUPpf7I3is9OYRtC3sS9Fc4p/V2clDFuNfJXJJoC+QB6tbsejOEwinujZVwi3VcWz1KEpP2RtsjomLhKi1wczps+JniZqcREuZ7KfNjl8vZXVJC/gN5xEsUN/s7Jv5yODmLnSUwGabv++5bf9N+isXvCS5D9wjBfaA647ZqTOLH6YxLOKAyvSF79b5fJMes X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yy8YG01+B68z/tcuBRhqscULyKyLbKzT7iv+gxfCWXOuKtx6pF2G3+hJpaDE/kqoNCYZtcsbilhuQIF/G+CY+iAsR1YqnDEVX7SexBz8OixVzeY9mEP1ZRqAlfIEu/MdlnH8PkJGLWsd7up1z2U17A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f00d5d4-7197-43e4-852e-08d970de01bf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:26.6185 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 21/34] avformat/matroskaenc: Avoid allocation of AVPacket 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: hcOYfID8sz9G Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6e34243f6b..250623535a 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -453,8 +453,6 @@ static void mkv_deinit(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; - av_packet_free(&mkv->cur_audio_pkt); - ffio_free_dyn_buf(&mkv->cluster_bc); ffio_free_dyn_buf(&mkv->info.bc); ffio_free_dyn_buf(&mkv->track.bc); @@ -2683,9 +2681,8 @@ static int mkv_init(struct AVFormatContext *s) } else mkv->mode = MODE_MATROSKAv2; - mkv->cur_audio_pkt = av_packet_alloc(); - if (!mkv->cur_audio_pkt) - return AVERROR(ENOMEM); + mkv->cur_audio_pkt = s->internal->pkt; + mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks)); if (!mkv->tracks) return AVERROR(ENOMEM);