From patchwork Mon Sep 6 02:27:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30025 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3374121iov; Sun, 5 Sep 2021 19:30:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyySC+hRgC4uKb80YDAULEd3cp+ACqra8d5uyGOVfgMMrrxPAA0qwXNV1EVHs5ujoWnFZnU X-Received: by 2002:a05:6402:51d0:: with SMTP id r16mr11041728edd.98.1630895421962; Sun, 05 Sep 2021 19:30:21 -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 kl24si6293457ejc.190.2021.09.05.19.30.21; Sun, 05 Sep 2021 19:30:21 -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=KsiRYVUx; 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 5FF1168A867; Mon, 6 Sep 2021 05:28:49 +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 95B2F68A7BB 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=aK1PDTlTCbI6IGYTnNLDiR/vfgwsCoeDVZTh3Om9YmJkbHPFfeMUXXLXUmoJ5S8jpKwWnmsXxYhSGLAESRDKsOmC3O+7PJ3cN22EYGg0aNn4fDrPtYcDs6xZb3xsRhgvHguTkRX7GAYAubpTWzYWaTRHIFWd39RUew6AnU1nkx3R/UyKZJZH78YVKFZDxElpSX/Cbzt3zdW4jA5zCrvovTKF46T85iCVyd0Uv5maklNm+mw3191NzA2YOefslB1+h21G/4OzAKLKeGJrBUdUGbuMzNCZxvMuAG+xZ6Vv/VPz8MfSztg/FXFHohoPHHjTOnHZTNU33x/nGxS/s4Zouw== 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=vxpYyJHcOAsetLIDwA9uBhCcuROdP3Ims2nCv2U/4Ag=; b=lIcOho6QEEHAbiq0N2cgyjNWD86EYGrNpv9lBbBiM4i2/GbzLYSN5tK3QL2kPOSv36q1MM0Wx29h6RLbQATTW7V0tMv+UjTCDEVwoNNVb6mwFMfCv/phEfRX2xgrYVl56wsawxFM68/Ye2n9SRsce9x8aGwgxGN5XaeY9atp83fFI4IE5hN34q4zP2iPuq+f+GHsPI5SSYUhM4o0QSVjRuyV/03XhP0E8WXpchsKdyA8NwITjmCtfTAIGX/gbJnj/jy45DL2AG4x3CvUoNpRDEWNHcuExa1579SWiAJZ7Vp8YO0uL7bFi7fUY9VOQl3Lllqvz+hOoLwDd/aZvCE6SQ== 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=vxpYyJHcOAsetLIDwA9uBhCcuROdP3Ims2nCv2U/4Ag=; b=KsiRYVUxycZ9lOvcIG1xL6xEGDVWYhECre5OqgpUSgvmLcnW8URr6WNiQKrEEbnP1ks7mQpHepIrfU3GcS6k4DxlKZOgKepFlJMupf1ZTJZh0tMqCrtVZf/Y0ofbpLUrVIoT65XmlybDafCCgEQbRZCdgOLO3bHike1FtTz3pOBFLENmzw8GN9uzZLxdjJsx1pDuluRTv6Fbyf4/ZmJA1xQ98tF30VNOFTlVHXkf1BFfGNvSAg0L38eOSBVY3pgr7qoXrNEgDe4kCUsE98DCyLeiVSlU9A0r1V0E9RMoAVLtid8DbROGPF6/Pprm6gmkJvM2Ua24zmSs6ip8g5AF7w== 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:27 +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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:51 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [oNPigCQbTXaim+t/1klsEig92Chri4i5] 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-12-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:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7344890e-599c-4991-d5f9-08d970de0256 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUZQ6GYRQPJKZ+OQ9+mOW9Ki4T0GMa/fZLhd3pn+5/2KN/Gtt05YfxLLCBG1gywQ6iMkS5KQdiuUgledzS4ZhFR2WFrEp0ihQa1PrRi6V6D690OhTYY68F22jnoAAuXf9vkDyYie/cirYsSFGdMvZjfuKlpISJi7i9lx7UEvtQ4iPc6d0pWmVoouDnlVuCFu5E7MbxCK20+adA30DKEfvGCWGFENj+4Omg6eA/ByWhN5gkQjh59L2Uu0KXaDfLDiG5Mk+aId9yPHvQBJuNj6Byi3hylSTGqOInYcjC9Lb7cMuxZAWHjqB1V6t6Y7rjpbU9g4zkSsJrA8vt7A+IdS+Iod3y5Yt5hdBILu5psjadQbH/xT8hwmIrICvO8oyq2HNobcZ9mWoJcUFTkeLrkXSQYw4g38Vp8XVM6fPZmnXIxd+DuAZIdb1R+VFjTbaEOaLOzEypPKyDLHqBXSliPc3WbyWl5fO+l66nhcXuNLLdrCALvEBvO8SCTl6WJkE+e0+QCA/NVKlS0Kk51mdrsqDyuVzOVGnpEaP1Tu47E11hC6p8SFd002Aei4uCGKGKHCsC4LwESfSkSUsuNsvdjb6p8iX+xh2iIfusx0W96QtnyNB0fsc9HZ4NmnlxtJs9Dm6wWrOhpagKr/LYj7AtkRZrN7Dwq400k7o48SfMFtrJaXiPJ4ye/xWTTmaF/4s1AHlRXp2vqiAckxj/iYT6C8Ux9Inv9wueCjuM= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xTxN5U+TF2cD4Np88m1ZkMoyRcEvvGokpj6FYssmJ4wpoKGy0TUjba0pLNuV8dJgVKe/UytrGDKJM3/G7x2F+ZFSh0UDrqpSCyRzXJ7gWvtTpzN8HRNpsTC9mZs/DS0pIcv4opTNffdXWD6fRl8rcV7FmZtMFqAn2Qf+hD2fIVcx0BzcfQXJbWUQGeFkh63vX3e6RGc5+DChVK6tpX90umjrvzsYy2PAkBmw7OnYcusk+qJbYk0n670lYOVrN/w/cHuKnsTJkInWXQpm4+HydHjVc6pyGRL23HdIEq1N32FHPcoAvZR6qo81WGwl4DIiyQ/JnNNMyD2VwXzNkOla9bGAWCF1rCVcGfwISnQi1jDDsq76FbZyjn2WWTmFxa1BJWGULrvrK1dcaJBd2fr/SHIKd2DKl7/34wnuErt999miV0eWvcHEdgb9NnY3wjfK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6F2lWqVVbx6ZNZJXNqB8EbtSXjxp9BHMETk9GcpH3WrgWrWWvx+UJNLPsqH+a+9BusBE7hmPD7ynMm+wdR2/pmJhXBCVC+SNUtc0SiXSNHd7Ed8weOotCSr4WPrCYETaqKNEUgSMgBiuHWb8totI0w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7344890e-599c-4991-d5f9-08d970de0256 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:27.6321 (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 23/34] avformat/mp3enc: Avoid stack packet 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: PJd0MUyjjmGG Signed-off-by: Andreas Rheinhardt --- libavformat/mp3enc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index c8328b8b9d..019e92ca8e 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -381,17 +381,17 @@ static int mp3_write_audio_packet(AVFormatContext *s, AVPacket *pkt) static int mp3_queue_flush(AVFormatContext *s) { MP3Context *mp3 = s->priv_data; - AVPacket pkt; + AVPacket *const pkt = s->internal->pkt; int ret = 0, write = 1; ff_id3v2_finish(&mp3->id3, s->pb, s->metadata_header_padding); mp3_write_xing(s); while (mp3->queue) { - avpriv_packet_list_get(&mp3->queue, &mp3->queue_end, &pkt); - if (write && (ret = mp3_write_audio_packet(s, &pkt)) < 0) + avpriv_packet_list_get(&mp3->queue, &mp3->queue_end, pkt); + if (write && (ret = mp3_write_audio_packet(s, pkt)) < 0) write = 0; - av_packet_unref(&pkt); + av_packet_unref(pkt); } return ret; }