From patchwork Mon Sep 6 02:27:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3373489iov; Sun, 5 Sep 2021 19:29:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOue1JD3MrlAgwnpb5Mbk8VSrOBpqBp34Y//l5GhKzSBFaGRDsddtf1x0bQTOA8/hCehW5 X-Received: by 2002:a50:f0da:: with SMTP id a26mr11237133edm.58.1630895351832; Sun, 05 Sep 2021 19:29:11 -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 bm10si6837332edb.36.2021.09.05.19.29.11; Sun, 05 Sep 2021 19:29:11 -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=otGDBu52; 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 5053668A77F; Mon, 6 Sep 2021 05:28:42 +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 3810868A79F 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=Q/YHWriheFMc614D4TSmcqRwX2hwnfWlD/Ks4qchzwaiaKVBjNansOdCnPZoMesm+tp6ZzevWwu1karc7vUOm0EZXbN7UrILiW/LJnp5JOG15Ir9cccXVIapKLG8zDtzeUEZmVjkIi+T0HTQH4U03o14Rx4WE1NCKN777KPFQna96Jt/B4sh3OZnjrkCBpp7j10J5VwMmrLc9kH9O2GBFF47DU3+6L6cZIQWqgGRKwl9cESvCLlt5LqFSX+HbGcbA6aX3Q1Yvxq3XXMLQRELjld1mSgr+kFVYg04XmLYZkI1qONNzZt+eLrMJE2LmlBclLn0fEm0cYM7ZqZztXOIUA== 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=4umhEoMXtCIMoVCeUij5splH76HvsRjxa0xOpa7SBBg=; b=Nq/AhJdABwPfZeP4rnwkTq1mvyRVeg3BCbh5TuRs9xcvp2Ds93gIzP43kTeMby6VBJhZpUdNUJg/09XPusoRmQoBWAk8uOQqh2YVRccw/IkEUdLtvUBCq31L6Kj9C2yPgUUUrQ/yt5UUv9du+hrvBcXMiuZSZHCAx5CRE9SVkWXBAgIdMoCmdGsdnZj10gUXGfzKlQpyy459Qo+ltWmGyY26XWMcQxz/TuxoNfcC/2Mn/CkJbxKRfJZPqtr3wmMJ5TZC/t/OHad1ZIOPsMPkOOPq9p6EExh5Z9ne8WcImg01DJE4WMLGuGKpePuZ/1wU8dEO357DkKfDcXacg4OhTQ== 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=4umhEoMXtCIMoVCeUij5splH76HvsRjxa0xOpa7SBBg=; b=otGDBu52itnFlYWNfJTrE6pEGSBQf/ZnD3QmHC1v6R+dDZ1XR+igdYJl8FsJsD8gaXpIDM2dFFEdqc7vpEqv2o4jYKLo+SNbmQ9L95j14VpnR7bF1AWi+edn/ALTYG0EwTZBclFkkIRzdjoz+iOsOKyYKPzEqgxgDrH2wdQsXC5pM9Xd+ajRpj2khVV+XpuDQDSyB/9y6206WLZ8ZM7xeAWZSy0Vqp0N1ZP8QLU6eOaXFWB9+MunRPsSTvKkqQ3wRzUtea9dOMylrmq7EgmvNABa5oLqi9ZUFdheacpue/NAFUuRDO5Lh+LtX/OjR07DEK+D3Izl91EOMDE23m7m2Q== 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:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [vpTZvDp6hcovCYF1F/NG2gTVSkK6dwcj] 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-7-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:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc6c8df5-df5e-4053-f078-08d970de00db X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuzDfZWnnqn466TZwHdqYFiN8JicjXrIbinCMINV8Lzs6HGuC1h9aZxrY2LmEsYhE5KEvCXKdwteep4QlOCvo2SbbcrKBXFCK9ggWm3JQ0z4BU0Jos2stzpF3Mm8dZ3ZOKz7i3UARrBFg9SUXWxTenockSfKADiXR4tpg9dLTmGjJu/vdNPTEdN2Bqsza2ZfS/L5aTGvUb3vx/fSEB5NaOek55xtBYBFSuQtbY4MDOWkNn7uK7woJtl0sM6qL4zsIn6nBDJN0uV4Sb+cVqjD4sTY61SuzUUD+2FuIDNcmh6I5lLSXwRMExSg2S6Gslm8XpLOPOqoAKEectEaX73v1jXYe7+Ro4fpiniBUu+OPW6L+XMlWLI6CKIqKREuIx25zw4y8+wgwLNLvvq2K0zNAWq82XBalrMoDUr818eI9ntHP1KhggWymyP8lZ2u/00GGbSgg0ETkl7GURsDtMpEI62QlAVepCjZjd6GHFDbpnlpJjSJHqSaEhrWhLcEzcSNS6VR/IDYmsX1hhBd/apkmfkv9PFMZJvxExlzgmWA/IL9UeidEYlm13iuE9yUMS4AmCAURy696xPgrYEId2hElXGWIf+Gj3Cs3jsuSabh6tDZSxsmJBKaxtek9q4hwajp3XZTHz6tJNKYqik6gNoW2b2PeaNEp+wyVeQbQL/fnh2YmpeWOe8V28QYUmzl6SdiBdJXmu4Isz+51Mmxl7+FNddUqr1gwstuG4OSl+hb2LZg8jRf8CCiQNjZlsAQFoXiXiH9Ocnt2ERkk7aptZ2myZc X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h7B2LiqtrjeHRJfOmFjvAVRzzegdj8xHW4OAIn2KQ71OXfigmsNKjLfcg+BvIwHyj4ZIUIlpGYAGJKS216cvxtOukwKgPpW0epi5Gc0ZdZhOD9TuB157/sMN0Yab7N6ryKZD4WvRzi18lhWibcnTrr42bfO2rjFXTEMFS67vWumLUsrMrcbWwvu0VnCyIMriFlcbocaP4X6G7nE5opq82CMj8AUC5lnlJu6gY11J3nUJnAjaEzd6DwnXhTl6wcEQFQeAe4/SDR+KI2OZ/dZd8cUCPhDrKhGsJtfjraF+vpVhOP2pYPZJUpCQ5AK/Z/ecH2V2LiBjeFFJKhMpdv7I+nZdSb4qCtH6vksN3YFGUQYNWq1X581l7iDam5CSKoAGTtPkS5xGm1QiiAJ3LNa+EdDZXizM6gxBG/xLSYP5ahXCJBrazR8Kxr/HelTud3Et X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MgfOQhUXZ3TLXfMSVUjhav6snanN/fr1mWiat8Meu0bjyYnUBa1YlMWyg3HxSDKXoo6DP/zL+YCNSs51YH/4S87iNYPxBgUAsRFYyEqSWxMyOZW3l/hCWjvyygm4a/1Jd31lI/KdplxjudsstBjSRw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc6c8df5-df5e-4053-f078-08d970de00db 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.1340 (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 18/34] avformat/internal: Allow AVFormatInternal.pkt to be used by muxers 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: CR3Z2QGQCWYI It is unused by the generic muxing code. Signed-off-by: Andreas Rheinhardt --- libavformat/internal.h | 4 +++- libavformat/mux.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index c3d0ff6b88..c16cb5b17f 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -116,7 +116,9 @@ struct AVFormatInternal { AVPacket *parse_pkt; /** - * Used to hold temporary packets. + * Used to hold temporary packets for the generic demuxing code. + * When muxing, it may be used by muxers to hold packets (even + * permanent ones). */ AVPacket *pkt; /** diff --git a/libavformat/mux.c b/libavformat/mux.c index 7373fcd1a8..c5e07aaf1c 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1277,6 +1277,7 @@ int av_write_trailer(AVFormatContext *s) if (s->oformat->priv_class) av_opt_free(s->priv_data); av_freep(&s->priv_data); + av_packet_unref(s->internal->pkt); return ret; }