From patchwork Fri Sep 3 23:18:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1731434iov; Fri, 3 Sep 2021 16:18:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOJZ9jJBLnf4cyJBpDqGuTrSBwwyiZnRfesvZRQ8nU584Ipp1iPtAICXbzAAlKDjj8AmiH X-Received: by 2002:a05:6402:10cc:: with SMTP id p12mr1384655edu.328.1630711121900; Fri, 03 Sep 2021 16:18:41 -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 c7si963096edv.182.2021.09.03.16.18.41; Fri, 03 Sep 2021 16:18:41 -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=XF9cL5zn; 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 8BC0768A4C2; Sat, 4 Sep 2021 02:18:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F33ED68A0F9 for ; Sat, 4 Sep 2021 02:18:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MoWdkkzNTymMUsbQHL0/UwVSAo//+8VOEdLIdOklJ/gGjHgVTNuyDiNSuYo8pNWaKtcmAdrZ87Kuzyo9BT4vG883Kdquj/nRdKD7Oe2OWFrmImAJbtzK0zcBfSXA7noUPJDfIipFk+wDM61z/ZuhmEFRosSUZb/4EGJouqJ0tYCt7SGzDGEL3qbrMgqm/ElXa7kt8Md1Vxdqj8IuDiHdxKGBdsnfdS/DRapLZGIDt/XMecCX7RYmWaEkobIWJfnNKsR9msW+CzdgbrFB982//qrODoSnYGTuPeP2giAz42P+EjWfz9sUNElmk+B58lb+RRklAQ8T/ZANVNUTCKPGlw== 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:X-MS-Exchange-SenderADCheck; bh=EwDLBdK9pzBKODT7Fl8VVBFjs0WYqCMtyQUDL+Fneek=; b=m9onmDiUQOoc3qmE9TzMyRiSpgQgLSvH0eju1Mpru+wcO0m+bQWdkXs1EuiSWBzkBlgIWo/L61EIn+48PZ5dt7da1rYkiMa1cSRzXWHVskxR5DYdDDSKXHc6wWv3k/iXE8LDR/zhP7CPgHxTAXlU+L9Od7Pp+8wgcdF8ArHeubL6MVarz+QNvU+mOO8EyQSo71ZyFbrc43jq7pMNSkyaB71H/OEQ8AgfgsfQvcBR3urPsW4GwZAUb2YG2pUrSZRRyDhxRT5xnMIbIgueE3JmgY0QknDrPGjt7Uc2agXR98P1OyWnbX15isGVItFjEHPBLmy9xd1CKZdWqttj6EfcBw== 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=EwDLBdK9pzBKODT7Fl8VVBFjs0WYqCMtyQUDL+Fneek=; b=XF9cL5zn1gSCHIGQmolw5LvEop5FZdpyPH0YmrIvAa6mmm9OoHoiAugIixrmfzPo7Y3g/6Mg4cxH8TmNUrKja31rBhNsQj5oS/Dp2t7VoKtM4wFPh4WI3fJLriy5MoHUVKFERBnR4g3ynlyMUtLlODUSvbAmORPfYnkO8LMmhl51NXKsr4f9kU9Va0n/zduW/tOmsM55nw/4OlwFTVVX6s8OOzBTnxum0U/OWMXXriHtG0K+YfPpsiNjR0aZb55n5mybNuP2K3kXsGbls9UfWllneJIA86Vv0V5YQkQ1FZSt5MgVKiUXSIJuyHFvycTEjOo9w3YgssNsWcCs3RR01g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Fri, 3 Sep 2021 23:18: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.022; Fri, 3 Sep 2021 23:18:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 01:18:05 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [P+jyebWXfu7Vsx6jDulHTTaxfYhzHP+l] X-ClientProxiedBy: AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210903231813.3346446-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 23:18:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0fc79124-0fab-4988-3b3d-08d96f31226d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTW2Vzrq2cduMqp40Qh10aEk/7806UxCX+fyjDr00ae+1U/WPgoJDK9ddkqyaIOM9Ivbi4Ge4ORep0npYKxI4u4wAuPmOqoWWg88Ce6gN8p5OG2epjTsiH8GJv+I8L1hGSk8G0SEL9TmKABVTx9uWuhXsDJOfhXFzxIO8LiTbtyt26keQY7HM6kQtkTgrhpTGzhXMhm0K9inkatOsmggD0ESFQiSeivAxlO71vtiOSRl/I6KqjzNmuTIC5BUznZGYX4WEFl8pCf1VyKsqSk44ks8D+4WMDonKW0MxZPaOcey7jyjvA+pwuOMhT13g6PnN+kijLvEysHyrG0Tb0F/5rjp1AApa1/4DGNWg3+a+sPpFdmct8ALAs9kRqJojyMD52PiByTlwN5cCzKaLvIFIZ7vOU8wKwwzPjWGO0Ei6m9qwUCqqdHfLLRBer37/4Yr2zQdHgSn//WtcureYH+tXIbwsd0wiFM1pwFP6lyephdaWXwQ5ADg/3XLhjWpAKaCp10OqIn3X+2eM1opL9YIomQhE88WTgO+JD/QbjE2qD/Gsps9KBr/qm7VQ/zdNj0I5Su8/yaT0H97jgzJ/XPOgK6K9FK9ghtU1KpU9ILVr9YsV6ilXEQdiGEWWoqqsFx3pMH9tegrc//MOwGOdEPYMP6AcKlqNc1t9x6rVKpBbUJJDrG7RRISD2b6ibf81K0AlJNQOFnzXxHdvOIzYh5HCG177uC944rUfYX4jTfvREzOK5NLgLgxyN+VcmZZ95YpXg= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y9QijRsJlrz/2DNl3q0gfnCAYmEUnbNVQfWgYEKD/OE//ESNqhRYsVZkGxINDLVr4b/xr9pxEo1jgB1fhqv/UwVBz2eSe4dRJYrtwLUjiFYPSWDqpxNBounJc4RzJTdWUBJokxdDabRhPZJFChDhH2YDVS0c2NPFMg06Fsba1b8LCAxapGwy2SWiHzQGOz5jkQGJ/QE5UwezALTkkJPEOL5nfI/ClIJpISGaPPHflI0NZLYdKBjkLDAiqVkLtb+qeeNVDaq7n4FbCctJAqyqQrwEIQhdvb8nJKeRs5qnBsY73hA1uS7wPGARd9amUfPhsRL59ug4D7UE3qPKt0jsF8AamyLfF+ZeGWza70ZRwWkAzuY6udyI7E/fXDCxi8Eh+yZDcmqEZm+tupeFvitJJvQ/Zaqhr9r+hqTiBC2n52TVfrEHto+tG9EwqyMTn1lK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /ONb3ZJQglPrVfHIFpeXsM5Y/Z+8WZxII37g3W0Z4aA5jP+JQme5xgI/zdH7RtKxX8KFyBgFOcYXB9kDPXZaV1j/g+/vq7mEIOAcFHmmZY4NLcEThfGkctIXHDvOLDrWc03+fgoUGogoJst0dLYodg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fc79124-0fab-4988-3b3d-08d96f31226d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 23:18:27.3361 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 03/11] fftools/ffmpeg, doc/examples: Remove redundant 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: 6b21yttTra4d av_interleaved_write_frame() already returns blank packets. Signed-off-by: Andreas Rheinhardt --- doc/examples/muxing.c | 4 +++- doc/examples/remuxing.c | 4 +++- fftools/ffmpeg.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index abc14a8910..879fe06299 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -110,7 +110,9 @@ static int write_frame(AVFormatContext *fmt_ctx, AVCodecContext *c, /* Write the compressed frame to the media file. */ log_packet(fmt_ctx, &pkt); ret = av_interleaved_write_frame(fmt_ctx, &pkt); - av_packet_unref(&pkt); + /* pkt is now blank (av_interleaved_write_frame() takes ownership of + * its contents and resets pkt), so that no unreferencing is necessary. + * This would be different if one used av_write_frame(). */ if (ret < 0) { fprintf(stderr, "Error while writing output packet: %s\n", av_err2str(ret)); exit(1); diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c index 13313a1748..9835cc4c00 100644 --- a/doc/examples/remuxing.c +++ b/doc/examples/remuxing.c @@ -163,11 +163,13 @@ int main(int argc, char **argv) log_packet(ofmt_ctx, &pkt, "out"); ret = av_interleaved_write_frame(ofmt_ctx, &pkt); + /* pkt is now blank (av_interleaved_write_frame() takes ownership of + * its contents and resets pkt), so that no unreferencing is necessary. + * This would be different if one used av_write_frame(). */ if (ret < 0) { fprintf(stderr, "Error muxing packet\n"); break; } - av_packet_unref(&pkt); } av_write_trailer(ofmt_ctx); diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index c3df955a6a..f681fa2e87 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -869,7 +869,6 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u main_return_code = 1; close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED); } - av_packet_unref(pkt); } static void close_output_stream(OutputStream *ost)