From patchwork Mon Sep 6 02:27:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3373577iov; Sun, 5 Sep 2021 19:29:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMxqOU0N7fb1HqLIwabnKZF8PqvLluqvxAlIu2vgL3gEpay6OXOyCm6ZAjWEWldnKeanhf X-Received: by 2002:a17:906:31ca:: with SMTP id f10mr10964372ejf.73.1630895362074; Sun, 05 Sep 2021 19:29:22 -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 q21si6408446eds.318.2021.09.05.19.29.21; Sun, 05 Sep 2021 19:29:22 -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=Ud6G60g4; 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 4914668A82F; Mon, 6 Sep 2021 05:28:43 +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 518C268A7A1 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=QDLiFY7fErZwAzkL8ZhOxM9XpzmUqs2SAxJ/bkmAfA6j+Av/sse80dr8PeNUeVZzFbyLso8z/Vdc2pVXJF/Z1jqdWPubujUWs/NP2txTsdJ5DRdc2rUg1ej8WIebuTyCqiq8RQzvlB5QZTsFTBRBICU78C2ZIKP79GpkV39kZtIgFwdbzdXaHjqKMcBxFXX65mo4Kv31HYDwnce5nbMen5alJ1IL8hQPObp8AOjrS/k+VaIDE5/16+bGMgIAiiFyXyRy8WugKTDw8u3VI3vI+zKLJcADtGZg9mGCP3HxgjivaThwYv7tt3HKSr2jcdkdivKetKs0k0+JDs5hSl7/9g== 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=c5wC39PU+wOq0R50APIOr/vcIzg5HQ2rDh2Wa4KBn3s=; b=PXz8/BuaZRrRhKYre4oI5O4IlAFN1mwE6LdFSQlDFOVshJmI5kX5e5fGsxf1ehboXkng+Leagz7pSK3iw8e+KbXLTC9bBs5LMMt7VpB09CzVjxAJIBfxFZeMcHwIZ6pGxMT+ttfSHPzs3C0wv+q+bmTbnaocSz8xeozAyWdPTLDQNQ6dglVSICfkyM48E+MeDYiJD9xHd3yu2QGbFNmSKFOM3W+AFdGiXemxKUp8lS0C4b52ou84JTd9NBFGkUdiW+aQrpseOFEUpfu9x3gcdqkW8W3Tb0YAnJEqAgcSk1S3xLgvnU3ACSsT4+mQjXU1IpZgmELAZIeFCz97vsfqkg== 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=c5wC39PU+wOq0R50APIOr/vcIzg5HQ2rDh2Wa4KBn3s=; b=Ud6G60g4UjjY0nJ8sJInFiBbZcxdu/x4JPkN9s7vaeTgdXWcdJDuqnyCc558ulb8NaV6we+Nb0m+4FoAoQ0pnH7FQMziK9qsSiDcGOk4xkFBLoSw4Kti7DJVKfsHI0rQwwE29hyJEvluT13WgQ38xcrbgizRmtc+OH9pcSkwM9IzlBMW8Jx0xYc3yG414RhYjWWLde+AUr5i8bOL3uI5uFCu40tBQr2ex+ZaUTfoi7Fu3ZtoxPsMw6g1RLnJXvcPAfJ39dSDJAXZQSSJp/uR1I29rAfFwDhuSdRoLOr6wgrCh8yLe3LPfH4G+0WR7vxpabsH4nF13NE8eQ2N7xzJIQ== 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:25 +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:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pdi7QMpf75l7SNs5BK9dbRITB5Jwqu6b] 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-8-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: 819e50e0-434e-4a29-0d88-08d970de0128 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUZQ6GYRQPJKZ+OQ9+mOW9KZHmI9oyCnADlE6jUEPEGCZaLigbo4henMfcu3Fa628Kq1PtC0huBcBzCyWuPDck2Ub0YRN0i9KGctpdMwAj/vpn9tyVROGJ1TvK1L+ONCGEbPJ+BMzDEZyNXMhbMmzYmRfNDv5MvnFizdsSbkovktn4KufsKWKPMXvCNUr9VfTs9c8bHWI4N4GX4hAMCiIYFNhFpCJMp04bdiWGsvtV2B5NmF42Z/eY/I0jNZj7MqIx73CAXeTBei8jOpAPycBgg2U0qJikVLyKXN/SvUkaUSOizYwR6Tn0gF8UMvxBgLDY7oXJXJyaCgRC3eXCBa9B5Nc4Sdu6tOokSzWK9F3H6ZEDrWgJIvGLCCxRVKV6dGP+r3ZV1jWI+7Ni9xmPOMStm2JFV42CSRShKZf7gD9z53sojmSc9BPzipFfFQLihqW7NKRJ+0N92j+EXv85py3Qym2WltdKOvDUdzyO5JPQqs2rWOAg/q7MHUAmcvMHH5na1kpw+EJf93tUSBbYAd3aWItGsF1XBkQE/+t1NFPXt5GygCUS/Bigj5cQELs2n0p8GuabyIqlGFsy9T+pZJtilK2o5xu9Q3p3eElGoDC18AuyTgs2CQxF8PWwRrygLVqiuaub3q9jfO1023ofoFRRB29xFf+Ot8Q5WodY+Ab9Cv30QiwIRMlk/bamTVOVKRrGUbaon0E7t49ZIeDQLCE0H9UwCpxRMgCE= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hXESLKUWOUD6gBOkqvslNy+zHmxBot81/xL5HCXbMWt5GgkBemGB1HrpCk6Ft0YwFyyLnKaXnKjUjvjwXoVyRIHaAliQVaN0Wy7kk6rnI6lMJZEP7BDR6jFy+axZCIKGQFoX66QCkFGNExz9SZTfO5tg0mH5mCoprh/9NOGTFgQtHW6aHp6X/T9+6Y7ZcBOfqEWNxy5NlAgy+yx82K5M8w8A4Fj+oiyIYuSPDoIUNHn1Y+P6fzoqaTncK6Nehtbqu2Obk6G/QYC2NlUATfIOz+UPNWKa/KxvfCIJ9XRAo3pVUZ3ku4haSoUlVkGpqLxRI5tknJj/MAbvQZXiyyxuS3lxcxTo8NB/BuP7jR+RJyeoFpzmLAsWCYImqeTGEtSlmPGJ18dnNa7DiVkzvgvbxhnSvJrTmCedUrmjXIVAsVTBn4WTthZWPx/UI3EZ7QlA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vrg6kjAD9tso1qALLFfvM7lnuIpL/pabJZBtjksxE+jDqhGcQ4fzN6Yo5/+pwnoizWZkGqh6F7qMK0P79vMImt73mmgZA3DKcy7APQwUWK0Zx3f1O0QbuZkAN+ehj+lJ2kiCEDdEGgR5MiAXkDB0Ug== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 819e50e0-434e-4a29-0d88-08d970de0128 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:25.6179 (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 19/34] avformat/amvenc: Avoid allocating 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: by0awr7X0vUs Signed-off-by: Andreas Rheinhardt --- libavformat/amvenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/amvenc.c b/libavformat/amvenc.c index cb03f00ed7..ff1a857dbf 100644 --- a/libavformat/amvenc.c +++ b/libavformat/amvenc.c @@ -62,7 +62,7 @@ typedef struct AMVContext int32_t aframe_size; /* Expected audio frame size. */ int32_t ablock_align; /* Expected audio block align. */ - AVPacket *apad; /* Dummy audio packet for padding. */ + AVPacket *apad; /* Dummy audio packet for padding; not owned by us. */ AVPacket *vpad; /* Most recent video frame, for padding. */ /* @@ -183,9 +183,7 @@ static av_cold int amv_init(AVFormatContext *s) } /* Allocate and fill dummy packet so we can pad the audio. */ - amv->apad = av_packet_alloc(); - if (!amv->apad) - return AVERROR(ENOMEM); + amv->apad = s->internal->pkt; if ((ret = av_new_packet(amv->apad, amv->ablock_align)) < 0) { return ret; } @@ -207,7 +205,6 @@ static void amv_deinit(AVFormatContext *s) { AMVContext *amv = s->priv_data; - av_packet_free(&amv->apad); av_packet_free(&amv->vpad); }