From patchwork Fri Oct 8 08:14:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp625370ioa; Fri, 8 Oct 2021 01:15:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaZ1H5R0TvbjUkikShH8l8vreV1TYCJCiowSSf02rZJROyuiaD2okGxDoJ/zO7Q+mAm2Ni X-Received: by 2002:a05:6402:3554:: with SMTP id f20mr7941808edd.210.1633680925667; Fri, 08 Oct 2021 01:15:25 -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 cw2si4086159ejc.730.2021.10.08.01.15.24; Fri, 08 Oct 2021 01:15:25 -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=DGxkw2Sh; 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 7055068A799; Fri, 8 Oct 2021 11:15:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065060.outbound.protection.outlook.com [40.92.65.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AC2668A4CA for ; Fri, 8 Oct 2021 11:15:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PMH6f8NnRvrjtfHu+O2QQ4cs/Qfi/Mk0bQttXctlInrMqu8e8oDTjZj+BxhKUrIgWDBAs7dUokc8ipqDY/1YpjVVUNc7GdkLSaL9Aw/Vd2G1hIYidcG7faHnXtD48o9UuN+OnyhrGzCM/AYw3TpM4nfesleIZ7WCbfdIVxK57LNV65Yr47xjCmVyZI5LRxJW8CxCFerSBkNQVXsfmBq9aGUuZL/UnG9i7cAEhZ5JFDqFvBT5UY7FyY+EpIssdMPu/sxlJwNSgdvh08CGvAxDMruJyzXboHhq1cTab4W3/slNk4AVcPNhpUU8kIioouWHMYCWJ/tT6lum8kLFFGIQTw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jQ0t2DrSdGax/ew2neoJfONi/8lQsPJH9bSUrNLcALs=; b=Acr0uO+RclrRJtCpxjcvCpH2MX0HO4iHEVmIMB+p3bAJjCLHHQDmtZdnxxFVdzYD1hPGfAA3g6H/SIOwFk66QS/gG/GO5H12CF1/dFbn4/hLKSZ+7do7SGTO6uEgRD+I/I5wYwkHo4Ap/uZqxQGahwPuVtkEtp1pj0ZovypMcqvdIpnB3sgoNcSqhQSsBDG51nOv9bVCxHA2zFX4T/QRPi9dR+NAoh+UliF08HP93LNV3ihYYpCqMiLptgD5nS6td0VwAlLEiiA6S9Zo5Gqj21j0Xl+GKP/nvi+LCOftcODinSjiK/dl+7TvVknNgd8jTsE4eHzzAniER9+b8cLu5g== 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=jQ0t2DrSdGax/ew2neoJfONi/8lQsPJH9bSUrNLcALs=; b=DGxkw2ShHOSo1zlvK/A7cA7gQJD+mCpmdbyx+zGPQthE0bVxxpt6pa/E9WMYb4gWXkkOt3sx9r55OkYjb1/4SbS8gUNXK3W28unibZNot/wtpe2Wet6B4MItHVIQvwV5nUyKkSuShHEuW+eKENONE3zn+Y2JK2ALum1qicj6UMpu3x9/L7WdhWR8tBJSR/YWsWgDA7mR88ncOzAAZl2HMhEzNLAOG/c634HDE9qyFQJiT9BjRdyeaI17lt8LuJ0Bm8a0nAXHN7PFmLbJ9C+iryR1iMcgCzxzODMUTINUs1tLgSIyu5m+I1OG5eUjXs4rEO4Bo2nZ9DS6AHi5lnnKiA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4951.eurprd03.prod.outlook.com (2603:10a6:20b:82::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Fri, 8 Oct 2021 08:14:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Fri, 8 Oct 2021 08:14:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 10:14:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/taXRTd3wH3kxrnLkCnjcHxmIhsiyPHs] X-ClientProxiedBy: AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211008081440.1156233-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.4 via Frontend Transport; Fri, 8 Oct 2021 08:14:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84dac7d7-57e8-470e-632a-08d98a33b4ac X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQkYSKJ5lHLQC1UaOPRuftloUPh6k4Or+7vulnFfktSEcPLq5hdJ7HsovCrmbAuUjr/JCO0mjQWzC1WBk5o99ebWOIZLD8S6Lztl8Ty5sHwgUlhDG0GQimOo47j3Z9+z5vWIJSr9L+0auwi2rauvuElFxyOkMqOCF2YUkhR+Sz3OuEx5uzb0xHUJkjX0br0C3+h5iSYH7qXl24yTZFYGinO17z64SgV5NNIxS3c750E6W8qfVQa5hoUAnuhbuLP+hZYh90FXgpDNzxvx4mLhb2mD9aLd5hqeygsBF+PATeQ3l7RBq9vG2JjBEm6lfhP3gBFAcZN5Ml5FjQqvUjSZvhhTn2AcvHGPeiqKFfavVnNJ1izHebEI5wCmOLmWKEBA5EUFy4Sowoms/b7e4riPIcoQL3CO6igbYXw8dQa7fIitnfyhw1ViuWl5HXYn4vnmA0YGd/dt/qQkopAad9872UMcczVZI2WfjLSS1juu+/+zdX4xWSsGQ7iIKvqjQHI4GMR0KPqSodhGcTxFUkJ+ZsjF1Y0i5oOuENrSOMpfydPVGiinwAiP6KgochAaOSO4Q95EDJQA6QGki6v2xDg/LNv3/r2KXGjIA7EMvbEkpKIiZEvCutg1UxJGAfMzD/RgJTxXFNIYjj6UWyef2EMnPFay5QhWBkBrUPjssV4ezIkPtZ43rI57jT8ntmiDSiQWEMuxdeV06YB+UXPCnRgtvO/H2RFnqyQ4E3I+J4cbkB7z8tTcLHzfIbRC4DsEqY56Xg= X-MS-TrafficTypeDiagnostic: AM6PR03MB4951: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o6Cx5lEFtBwOUPzMaSsKq8xeNAIox+uuMaXTuruYeByljSpF6TKnH76NdJVbKlzY7nw42bVkfdiqHjGiaD7lnTO4SLzQ9pEck346VEb8h/V0vSYgrXW+/K1v/GY75PwzxBQRdC71mbNtLvxoWIzsq8FfCx7uThFrZ8b4aHAsZX7Q30jX76KPz4SU5uTX9Jjvkyz9kEOUfqBNiewvbkmPZTZfz9pq8mqxrN95T1lZk4bdRB5XhAMCn28koSoTe1gaBIrayK5EhL/0Kd6zqk70ft/GOJ9pAK5MdeDthFaSKW61D/+BOuOhtQjuqLRh34eD63n3x4VTBRdEuS9N06c1z6sevmhTb24dxMQp3TS5stCMKChkHR5/NwVyhSoiG2SBtPC288z/kh9xIN0CiCEr1JczcVBt3d+l8r6bkC71HbVVXQzPdaZ9YE1gLNUqDYIq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: unB3nYFnvHPYZ05aRotJcpqgkpwBIAul1pxvyADbBz5DckA7wn8WoXwkXFvKyR2QiPvtTSjcqn45FH0zYKFX1QRCx4WOpWi2B4DdDNWtgL6zp2Y2oKEnrV4J9anaGWivpdO5yDx4AjHcXNFASrnIcA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84dac7d7-57e8-470e-632a-08d98a33b4ac X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2021 08:14:53.0798 (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: AM6PR03MB4951 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffmpeg: 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: uELzuk58r2lQ avcodec_receive_packet() already unreferences the packet on its own. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0e38d6d185..14611480f1 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1033,7 +1033,6 @@ static void do_audio_out(OutputFile *of, OutputStream *ost, goto error; while (1) { - av_packet_unref(pkt); ret = avcodec_receive_packet(enc, pkt); if (ret == AVERROR(EAGAIN)) break; @@ -1378,7 +1377,6 @@ static void do_video_out(OutputFile *of, av_frame_remove_side_data(in_picture, AV_FRAME_DATA_A53_CC); while (1) { - av_packet_unref(pkt); ret = avcodec_receive_packet(enc, pkt); update_benchmark("encode_video %d.%d", ost->file_index, ost->index); if (ret == AVERROR(EAGAIN)) @@ -1997,7 +1995,6 @@ static void flush_encoders(void) update_benchmark(NULL); - av_packet_unref(pkt); while ((ret = avcodec_receive_packet(enc, pkt)) == AVERROR(EAGAIN)) { ret = avcodec_send_frame(enc, NULL); if (ret < 0) {