From patchwork Mon Sep 6 02:27:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30013 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3373757iov; Sun, 5 Sep 2021 19:29:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/DHXJU2TXHRe+ORCC/FlJDUPA/pBGW9TzVDImhSc8ZZdQOJXLRC4X0LaCMfqJHIl0CNWz X-Received: by 2002:a17:906:d045:: with SMTP id bo5mr11230638ejb.461.1630895383975; Sun, 05 Sep 2021 19:29:43 -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 gb1si7130531ejc.89.2021.09.05.19.29.43; Sun, 05 Sep 2021 19:29:43 -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=EWNuGLD1; 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 3B12F68A7C8; Mon, 6 Sep 2021 05:28:45 +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-oln040092066020.outbound.protection.outlook.com [40.92.66.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 695B068A79F 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=X/51dFZXHT7hYpk2TyZvhuRnZRtSY2iCJRzmLCGxeROIslu0KVbXBYh89zgfAdk9lAdUwr9D54nY7tqbTOAVkiKGigSfZhXYyV9lk2VCp0/lur//Iil7So0X46j18BdmMUKUI7/9tDYg0/s9LUE93Tiyxh9MRG74kBgz3bTl6ReVZ4O2VD+vnO96VL8dB7F967uCrpW603uUxbHSLISbyE77LWEfoDWeWa+JEysJnGLYqCU9LHVT0Q0HX3T4MGbMj9+V8qJNER49yp/AH7MRHVWbW4sMH7SRrjCRy7bqxf3dAhOJl1fgHJtTGC2VYmJAOWZg1Y4iw6X2PShbJgeE7Q== 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=2zTUbQl+eFsbFTi4sR7v0BGn2ijs0WsrqwF/Pprc/34=; b=PncOZqb4+I+b7uCofi1AQ8rXVS/X/jmyD35Kcywj+97sK2xC4u4d37X4784krdUpx67EOrNXNrzoAVupLGt7mtqqq6aFWZQ4cU09DaADVq33ygHOCXJ4xzw3ZJTEeDwbgTt+RPedx/w3rtckJSLq7TxklPlnNLGT2lwwDi9/7aH4cUO7CvYUAR+1Z32FTHqyuJE0UMnVfpiVQxDnZTqT//CnbKPwJ6b9CDwR/45iJo62/Jz0RQPn121tedvL2OxtNLLbWV89heHqap5V38nqVkYkk40oqD/RBnM6yJz2L8e6QZQXO6vSgcFS9XYeCWwL5sdmP+ue71ImKyLpmQduwg== 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=2zTUbQl+eFsbFTi4sR7v0BGn2ijs0WsrqwF/Pprc/34=; b=EWNuGLD19Hi6wYpzvFVwBYCYFP34Tk93jv1FfwpI1+eYOLbrsEdl7Ve3kIAmSaqVYxWL2hi3rpQ9fUFjD8tvrDI0IFfUnCfZbg3hZGVdWGJm6Kt0/hxOAbGZJFXDf4DhRtSdGN6PejkNs2hdR8J6TiPH7yVAfUgNFjqhk0mQQ4xuDYKnS+59UEnMyT1QjC5MWsO1TFBtUa7s4EzABMmXCScDIhwsTaQMiJIGhwaKfNNXJA+6qnrC7N2SGoTdi89KWIegv3w19Epo8dPz/UMyiow3ceNZhkDmfHH+SqT1ab7m2GFpykNPmRb61Krg9E07T1985aIg6PgtsFlHcv9JRA== 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:48 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [qaCTPYIxQ7LA6C7hksEwY/0V3LC9DSjD] 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-9-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:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 666ace15-94b7-46b2-cc8e-08d970de0172 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUZQ6GYRQPJKZ+OQ9+mOW9KDtVaMvK9eO7ZWajamMujJe77cfmaQm3ITfq5qewgyqlYzprJzIA5FQS8JpsHy9TnAW7+2ToFUpQUXSgwobi5/Jp4nPT8jLv+3WW2GHUmDzXRFnvKRIIU9cpq/S1dhnx7tmKnliZEgIsEVpcD+Bkf7Ybx7zT1LyK0qvupHSy1sxOxLqAi//+7cjqqhL0qHxEJvr0o8OPiDP16OxnZPgAYR0EZRL6pcuNjo+UphalCzfQNdu5c5nIYaF3ovjyPxTc6i2FMTKIOx0f9yvBSi+g9kTxQT2IUYzFiZOke+3+06QXhg3UJ1Z2hyZMLUX5dzUlrHuqlpPZ0rX8uwuaR7JLwC/zAxjV/ZZKqxVqPXzJYNzX5bEDLb4TYZPMTIGnqu5L3ncZYslJ3wD7RvB7OhlvLY+HYpWjrO0WOlgfOPyaOZ8sjGFmbXpS4bgosdegsEboBNuebAo1hnKF/h7Fq8ywSJObfP3MwNwwJ817LJNtLIvrv6/MOF0miUnLIw+qwyk2Qs462ugARO0y9k9PX/kHTQBqFzBL+wAgJbQL3ws0vQOGTMnTQ4KdtQG+wZ+o4164e0xssWKFHyswnYjUMEmJQE1t6FizkOjVM/vmkSvMmD5EtsWaGTY+sSDREZUZKXy+csbCIAyzA6eGmw6rmRdQpMVsn3Hr0H/r2hV+IiXsSRk0eGG03TAI6A2+f0iVuhMoHC4dEJ8/5RaA= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YKunbaF/y2GuN29E+iROhGTgg7CHE9fmHdDVF17UPpZfKVS/vvgaXPC4r2jELuxPcmQI4RQBzZs+mUjBqWjq3/1I2Dq8KY/rlobx0epBL/UH0AedFOT314hJcxopHht83u0iM3AibvdBxFW7A6tPHVSKzAyA3iSQvwio9j62JmiQq8/EkrWdsBxzl9L/tYgtmJJ2xu0xLkylIGlgZUOWX9kqzupbsSVBuiStaBmY6yIHA6crVHZ1i3oJejz6Q16TFBQX90GMrJtIiw8gXEaDxp61DnrILQZtCgu0rNJ1s9xj/Y5dq9Fyu7GwNSB8XaimouI/WtCqsy/k7o98dmvYC6CCmhUyRU7FOy8xuxLa7lRFsKxAdVb2TM3erYOXnWJDkKCzCoaQenaUJlVYpFx1kINeTHCFGf+ifpLGcWF4fGt6eTaumj7BDaUoXm9A12aN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pFeRy9DrxoC0RPrTf+mGuMYO3K1VGiqDASaXYuPwTewpysqd0KE80rsb9jgziYScDDUZ+IUzzT9hylEVNZzKwxHWVucUgAzd/9ZoSOdg5sOchOZ8Jf4jBj5XHS6rQFSXMgX9lFzkojrGyExAwzFycw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 666ace15-94b7-46b2-cc8e-08d970de0172 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.1356 (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 20/34] avformat/avienc: Avoid allocating 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: gW71wzHXBO3s Signed-off-by: Andreas Rheinhardt --- libavformat/avienc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 9eb072ce12..05bcb8cf79 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -275,9 +275,7 @@ static int avi_write_header(AVFormatContext *s) return AVERROR(EINVAL); } - avi->empty_packet = av_packet_alloc(); - if (!avi->empty_packet) - return AVERROR(ENOMEM); + avi->empty_packet = s->internal->pkt; for (n = 0; n < s->nb_streams; n++) { s->streams[n]->priv_data = av_mallocz(sizeof(AVIStream)); @@ -980,10 +978,6 @@ static int avi_write_trailer(AVFormatContext *s) static void avi_deinit(AVFormatContext *s) { - AVIContext *avi = s->priv_data; - - av_packet_free(&avi->empty_packet); - for (int i = 0; i < s->nb_streams; i++) { AVIStream *avist = s->streams[i]->priv_data; if (!avist)