From patchwork Mon Sep 6 02:28:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3374837iov; Sun, 5 Sep 2021 19:31:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/Ied1xdtQXiS/WnMEklQTfo729sPX9ahKuahXQYTG8hinjNxw7V26Knass3zmat+8E7cz X-Received: by 2002:a17:906:840f:: with SMTP id n15mr11403855ejx.460.1630895503998; Sun, 05 Sep 2021 19:31: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 bu15si6548224ejb.164.2021.09.05.19.31.43; Sun, 05 Sep 2021 19:31: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=OobqIuNi; 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 ADBC668A8E7; Mon, 6 Sep 2021 05:28:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071040.outbound.protection.outlook.com [40.92.71.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4897E68A78A for ; Mon, 6 Sep 2021 05:28:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ITMLPhnCcrqqhqUkTAq94qwg3tCY48d51VXcLCt9e/IkJGeaCVMqgir1/i3Mzo6eWynEMuhp5gJB6wdvqrLg+ACf6WZvrhBPeVcGKfzMPL50OpNeqWlIAp9km5Eu7HOeCkEm68j1QYD/LbgIK96TzsQdDVcMk/BMDpe1An39HeLqSwT+OCXrBZdxhYbaWNkW6kg9XvEnlLhv06EVNfg9LxMgOMMcTLgeUmHL09/vYF0rKCzzEAIHP5fYll3yMWabevq64SXtlCyFsoCJU6vVI0/I/CxNwA0G+UulDeqEx7vINcSPcCmLV9XkkEatMlDMhJZJZkfqFc0thZIvJ0sNvw== 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=NTIrHktmv8Eegw0w95CtxQAGNNKKeHIWY8xMCDFZnEU=; b=hVeoKGqthGzpGLEoi6git6aiS42s7RfGqgFAnPu/HWFkeHnoICRWcFyAdaDzQR1fBRK+E+perwWL/YWkuetijLTz9iLjcENXAcSqeERsHKnONEatw5ZJCadriDz5w7raopx0LVXwxkPxrP3Jj9vQVnTW19niH+4wpf4MDrjvH0fQxmj5Y8zZrPlqq1vTgTyjfa1e/vjtgLvtioerMnDlkvJEv1JYOj36f+8RtQQ/z5Aj0VY5AGG+u2DDAKxZTLbNUUeHE9SGQ59ewqxafKyKPrkO13CgPe19GB7tm2VpIyNPPY8392pbagzilXQtWRa6cRaygafpvk/Xzr7uqSqnPw== 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=NTIrHktmv8Eegw0w95CtxQAGNNKKeHIWY8xMCDFZnEU=; b=OobqIuNiywQi/wMGlX0vw5ElZKdzarBgBY1i9+QLTZ/9IYfzFgGo1a8yuw/XIWUZdWeMdLKZM2DA0BBooWhISLpaCjaz+XUoKaswml9abVdiY+1yg6mEq3stEgsOj1SDpF5SUmdkB6bF4EeQzofffy5GHKgbfgxuxNgkBZ1J7kmzxlQuLAggMhAz7jo/Dka8E9IE+loNP2WcOCSxTOha+ofoDPwBByy12f/KGlnQMtL5cC1/d3Fc3JC7PLVNTGqR7wqj8wHREkrBDa6en8DP25F6KAgYlt9dmuC9dVBxlZYuQ9EjmX+OUxXdqCiwaHQ54rIl4xnhJSqQxpyIgFCtBQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5380.eurprd03.prod.outlook.com (2603:10a6:20b:c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Mon, 6 Sep 2021 02:28:33 +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:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:28:02 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [DxrFNPyzpzlJWpPalHIRAilw0YGvLRRm] 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-23-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1160098b-9b33-435a-dd9b-08d970de0582 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQPQD6tvsiQeosiZzDpp5hD7ZLzhsLEDo6gaCixxiOoBf2+Xlr62WLmC3CbBXgJJ82moJRgQYHEhAd2b9lGSHxSHw62pp3S3KaCCvQLXKoPnMMlRKIUWLnTHfaG/YsBxpr4cAeroTTq6z8v4OCd28nmfiutEXIw7J6TuBdZMCraIlPCwnnFRJtTWwvD78vAJUczy2fOVoqT/dwdNtnregVpiDAP711XquUq5B7iQcdfzv47kVQSYQDTqp4w+mJCxk1lJm9GqkmghFQavGSaBMaRvl+tSBkJg759I6FW8/7C0Ct8nNRaS/fbeRTK6z5WAX6EHTi8DKTOA/TZ2LOV/hz2dMq/Od0Tc1NGPB28E5jzuQW2rcevboPzmHFkgg0IUZJZE9sLU0HyUUULIMeNFDZIpQR/M2vz1NPgISVVbpWWt/2UhVahcoTi4AonnDCNwsMw2n6h7KcKgS/6KbaoLENHJpCRZG6qgKDe7CNTg7z3hUNUzV3gSGbvmxnd3yj+paJK+O5u3lfZAGqmOuP7Bp2C6o/3gB0if/cJZp/jNjAjMUBuMHCgwJD6c5A/mF/fZaWM12m6s4BE3OFC4wDG1WgHAKOkbj8ZwuOyDNCJnaN78H/7ivC0TcK4JVg4kqeMIEmqLA2ljehRFjq6XNydO/YZVqXwmJRQcCg+N6wdCbHUJDXWdBKiCzV+F5qnH/tmgAeN6HCIlOKsS3BkzrK3uCdPpH5Oyt6vfCMg/co9E503eQ0oGDxKx5cOz4mf9aswjAo= X-MS-TrafficTypeDiagnostic: AM6PR03MB5380: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 43hv8yStOuNpZKR0CLwgsKHrFgBfNTFDn+y7NcZu5Kj8Cg0ISBYxbOdN4gp9J2ztghYuAhrVF67Imjp8nUbgGJGw/L2xWtIGrnjNuD8xj9+a1DBNUn5Z6GM+N69qfkF5UoBeVBNz1D9281cBh0iDMuvvYjtDEe82CeNUUw7iGDmtXUTAs/ifH7rKp1jj+q2+uTsxEHB4EqJDWXugwtDuSX64QH7Li6gUesySwJ1WCmCnsjg8y94reQf9hjqwDwkxPhYruL5ilFKV+hz+uCrDFcFGcBkVMeMYpvDDuPfAWUSf2XFamaHBL9JEYE9mpw8Qw98Irtx9Iuit/HPu3L4vhrV/BGURzH0M/amE/zEolyHm+b9H33uKgdlU0oqLKapq6QSORxVzuJun50mKe3CELQz6g0x9KhMeTm61GU4nrfl6sTtziBItH/MKhqlqLuLf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fEbI6d+V1Sh7ER2graEYEOTM34eJ/Y+ghepQgjFnREGFb+nhZSXLSaBeKizHQMBfde5XJVjqBD7xSjOayPQKoQ1koUtNiKM8EqWO8JZF2rF9wMGUUiuIWwXCIkU4yLKHmGz3RuLYKDbSc47hvFQIjw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1160098b-9b33-435a-dd9b-08d970de0582 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:32.9239 (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: AM6PR03MB5380 Subject: [FFmpeg-devel] [PATCH 34/34] avformat/mux: Remove unnecessary av_packet_unref() 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: WdByOzBlESov AVFormatInternal.parse_pkt is always blank after having been used. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index c5e07aaf1c..47883ece37 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1196,8 +1196,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *in) * The following avoids copying in's data unnecessarily. * Copying side data is unavoidable as a bitstream filter * may change it, e.g. free it on errors. */ - av_packet_unref(pkt); - pkt->buf = NULL; pkt->data = in->data; pkt->size = in->size; ret = av_packet_copy_props(pkt, in); @@ -1240,7 +1238,6 @@ int av_write_trailer(AVFormatContext *s) AVPacket *const pkt = s->internal->parse_pkt; int i, ret1, ret = 0; - av_packet_unref(pkt); for (i = 0; i < s->nb_streams; i++) { if (s->streams[i]->internal->bsfc) { ret1 = write_packets_from_bsfs(s, s->streams[i], pkt, 1/*interleaved*/); @@ -1345,7 +1342,6 @@ static int write_uncoded_frame_internal(AVFormatContext *s, int stream_index, if (!framep) goto fail; - av_packet_unref(pkt); pkt->buf = av_buffer_create((void *)framep, bufsize, uncoded_frame_free, NULL, 0); if (!pkt->buf) {