From patchwork Wed Apr 13 14:49:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35302 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp244569pzh; Wed, 13 Apr 2022 07:50:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxa4FW+vPlis4lXUuqbyL1JWDO7p3b5og45KNtpSvfaxqtQx2R5S80QZyKAqcdt1KDLh2Cs X-Received: by 2002:a05:6402:2743:b0:41d:8729:c35c with SMTP id z3-20020a056402274300b0041d8729c35cmr11869545edd.22.1649861412772; Wed, 13 Apr 2022 07:50:12 -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 j7-20020a17090643c700b006e7eb9aa825si89744ejn.416.2022.04.13.07.50.12; Wed, 13 Apr 2022 07:50:12 -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=UZszAJSb; 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 B83D568B3F0; Wed, 13 Apr 2022 17:50:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068068.outbound.protection.outlook.com [40.92.68.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D841868B2F5 for ; Wed, 13 Apr 2022 17:50:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SRWHujLvFU+pu2b+zEtMkQahwNrerHiP7FdnlQJNgAdL3KkXyTbx/n3mtEJCd6e1iKDGV+qSDDxmtTOlK1xzs/SIboXLBcHfsQORsX0ZKV6/5+VEOsgcR0vQHFswYwmdCco8vaZzKxuw1yWdcPSFYotrpFIUN7m9NP+t4M6v0Qs2MD2GkYHPr/22nu/ywopzPoESTKiGJTeIz+rokTj30XwyeXbZWWS6bysE8nWwyRqGih5hLV43wfAMoDlD7fGzLBVDxxwwhG+EKwclylgVEoQfZnQygRGyoDWdtL9jbmIKB6x0+A5G0X3cCpTmSbTN13t/8z9Ey72Srf7f0kiBGg== 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=ni1bAB0IxyCCjRkao5uiKHETRzCd4IG0uRnWfVSfkOg=; b=AFrVWZWSKb1saOEbXQq6ZfEEs59ZmHThRS89RUVkM49S+Hc47/dp3PBnOI4f7C7QOaY0iQelneJSjMqPAMWSW2dHfzyPIBMajFqqGoX7WIMcNkwGJl4fPnMHsEfffNy3LDVL+YOirmGZhW+Z13K8TRbgjPURMSzw6zTpU9sg6CbkvTPNpv8Xp6oyCiXma8daA032hZY5r8T4AsXJxunQepA81VffCr8QJQswS2t2V5tgt/4oHdOIGD7po4ye/vH971hQxVNjUbzce4P1cAxPVuMJz9lZ4n36fi4/1VfcXz/IFacEic/TG6uy/CMTaeaZk+idlfxxcHmHwiIzyy91EA== 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=ni1bAB0IxyCCjRkao5uiKHETRzCd4IG0uRnWfVSfkOg=; b=UZszAJSb9kmysaidt/pdwtywFIEPKKlXya5tHjb6IYCLdqUaT/8uR0gaAgpLqDBSg/+xpGCpsyC7IQ/8q/vsGuApJk/2uPOWWHvg3CiUvr9ltMWjA4HQBR6CYH09jV+T9wrRObttEaZEAppL9zjYRNdSjMir+WEb4KJo8DooCY0tHvbkKWX4kpCVwAkNHLXRC52O+mJkVLEQkPXBjZtxQDmtdTxXLRUgytgazVNtoiJRVcDiBteEQF5beHTyH8JgbOAE8IelaMgVCzJBoX872QvOYZofirY1qcAyntCTB565/SssVd99rzy93idtvhW9a2BKslJ3U1CZn+4TlIGPHA== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB5391.eurprd01.prod.exchangelabs.com (2603:10a6:803:d5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 14:50:00 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Wed, 13 Apr 2022 14:50:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Apr 2022 16:49:50 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [FJ5ZpxqdSZkkSFH5OT4ZArBX9km2dSbV] X-ClientProxiedBy: ZR0P278CA0073.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::6) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220413144952.968854-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d9f3444f-1ad6-4a64-cf7d-08da1d5ce284 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEv4Sx6V1usX3yj9LhccNk8d+xBvuKpgpyfvLvUt81v9nCLHXolZOraRZcuDkYGZpwjfZDhwspktaLwj3M4pVygB5p01UJbRoNuej7znlpEkXmNa2U3p0bLVJbdshPBrZ6/CSTGVRoL3YFqvLC2Zz8H5137UiPVzD7OdG9f9X6iqfXjPgwK+4MzqD13OKOF1F9m417HUxbVx3LHmonrLLigz86NNOQ4gIKeET5d6O9+Gp5/kw1uXwmsIAm3cQnQoVPDJyDBPtzNSjiFBnFoM8wXcNo/CRKBnyev+L6S+nCqvMWfNaLAhV/kI2hwK0FjuUeJMrbtL4FymAE0nDfxFPON+ag+dFNOgXko3BxFnRA63OYqYTUuijMfeQEfydYYOAG12WUGFWjid6blCcZDhbQ7KxWs0doY3P2j3YlDzRg9fwK5nDhw/n4Yx+U8eL4kzB9Q/md/3xQiPD2+Wq5qsl7+lcCFmKulmVJkO4ZKkmWUKKbEdNczyEgqbAQp/t+2o3jmvUii1NDRzFemu70HotmO3YiCIuPZ8wyNv8r1o9l4ujIsubBxa31oA5iMMwXdcMNZ5tYs4uL/5E/E1vuyuDDB40A0FXzAVVxnYbCVK0HjjRFH9SZ+aoz5X+xEC6jkhN0nEWDfA1cfRaiUdZARyMb6PK1jYNaNXTxhhsowoVS9vwpCdyRIZFqCq2gmDLdHTq8hcsRkLkH5wgY1upx3BVx1lwGM/6vFKuT0fzIzZt5tui99xP5yUaqmbJylRBuWzCBKZ6fhBrD7nYCR9kHML/Mi8 X-MS-TrafficTypeDiagnostic: VI1PR01MB5391:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EwZvX7xFL4r+CO6RqQosT0RS1JKjKoAB6cEJf9Xxo1mcM1AtHWT+IDgsGXoODC3c+CDkXZjidIsKxqEztM8M7ugWf1eSLiX8pI43ughUx/ZdGcWFEwnM5ZwrzYlW7PXJ+GLoxJ2tWTA1TCSGUbjvKgpZwNPy5KvH8QWop/A0SReNzc7R749rVOiHW+1ZBLdj+Fc56gPqcYUYM7IutcTUeDhSns3N8MQAdGKQJIkCSLOzye7WI2Z/DC2aIdXsL/ap9plPbIAL4yjraPCAxpjMUG4RZ8kXJW/hhV3YO8Wr0e6qxvsoAm8iEtTFRxhaxVtySqmgqP2GuXqoHfnj+Esen5HLnRXKWGmdQZRFjYBSjiYyeo4xkUx8PkbLGM4Ze+ivmopYJ7L3B2S/EONoD/H2pbe9QA64iawuPM8Q4nrI3kamBcoyOsNZZz8JgZ2FSYJprR/xp96idoaLi7Tu8V9moLVcTFJu+A9ckbiTK35pnrUiMcKtzuppU3J0VkIR/7ub2/ZYJLUh1q4KKzgoXXU4JWXiTV7Y3fOdP2kTV08prvQLPGkGoCd+7TmQnyNggPFRxhpyt5ICyR1BQDqJs2iM3g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HTIKitPpEXy+y8G0AypwpukhjEuCCN5evKUvZjw4UdKeisYZbQdgs4G2lAKAemKuszgpXP5VakpfBnUgBfNhunrIzOxU292/aq1iKV8A8IJ8ObnnqqvBVaKdPqZbxyFRVxQVpToiU76I0yyTiuHCcEsglP+AgBjErcrDp44F0QgbOyig0Rg3PoBT7nVF8QPpX9VnQ68FvZi3aGbLRYV4RdFo1Y1KqCmZx9M6qJJ21hFyBVB4zKFc10bjo8K70QbOND/7AFyopChRUbjiGm9w2cRyDVgUfhuBqDGXJEQVB177Y4oIy8Ul0SAAcWsNxjY8cbkquE4DvbU3tCcZGjV3qACw3sjFijaBG/dkCK3PrE2belxMTICkUcrF4N0HTP0KZJuFwBxPCsZ1g5SkSj9ick8Bse+zUb7pVDh0BnbA6wAQeYwwa1ehnVNiSPX0Jx9hwkMd7ucVk4paQ7XcluTQLkTA0D0kEB2DFsjbFNfOubbubTy72EbJ43GIzhyasr3BGfHOyq4tmiDdsyVvrr5+NW0AlRufGCf8qZEv0yZWDuN3IhjIE8rqH1Ho4Md1XA3KJqXlT+5bE9dYkvlxz9YYA9wSXxq/o+79FNh/vDH8Ey0Otg7wyJUBCmn4Xj2qYMd01rRi3BW/cNUg7cU2fa/yQ+EG027ZZpO3IG4riIxqJTX1cw18Ru9RsQfIppjKUXxjERiTiLIZb4FbqGZoU49G4TkGDC4lhuT7VXxb0Bw/tx7vaGZY8EEI5O/5gLBKwNdg03syzPq+kcSymbwW1bpoQaWjf4KWEwhPpkCu8/ThD5ZHN/zk5EsCxtCY8cCPOljFZeBAQy+fAAHbjV/WZS+ePrgiWHeHi6l3Lz5VNSWhIKewmulqoWyjSfAg/SToaNbeAcnWpZldY7HsILhvoLvKf3tAvfPfNZBKUIXfLWnMDCOgARZho45O4m1u5CQXnKBouOlP+TnWrLS/w3qUWLLf1VP1bHj3UJkmnFp36jBJY0b1xFVDgD7iZxegYUPxP1IpozmwWFDBgwNETmVzCA3IrmHvOoGSnGcZdE7kkDeUIg/QhY2u7stG4fQLuV76y1Tp2EVNMvhL7mPemnOrQEJRxpOAoD2IeuDX4q7uBlivLRRnoOpO+QMW27PNIVQs40SgQhkgw0DDp9eREhMED7gSVo4Ocp7bUvwnduMZHrlXwkLPCr4wiIjMkWUpC1AVbB7BL9f2MRsfgRWCcil2fF3PPVoAMNr2ffpiuknl2biButeiJM2kr4rFwb5GiFZEvE7DD6FVEeQBpKXo3v7nQuzt2mhVUMOPz6WSBw+jPhgsgXULvfZKrkOQlqw+PDHPuaPeQfQafOU8ygfbummx6/5U+cytMnK/+ZLsZuEl2JkhZozj911DsAizqPTAH2VT/XTJ0qTODVF0JHg4+wTtp5PwO3Hoe7l13bwUcdM6wYgMJRgk0oGcdO90wH4zsX6jotU1 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9f3444f-1ad6-4a64-cf7d-08da1d5ce284 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 14:50:00.3387 (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: VI1PR01MB5391 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/avcodec: Avoid av_frame_unref(NULL) 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: F82V17fhxEfD It works, but it is not documented to work. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index e0f38ac42a..ded6b5b307 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -420,6 +420,8 @@ void avcodec_flush_buffers(AVCodecContext *avctx) "that doesn't support it\n"); return; } + if (avci->in_frame) + av_frame_unref(avci->in_frame); } avci->draining = 0; @@ -432,7 +434,6 @@ void avcodec_flush_buffers(AVCodecContext *avctx) while (av_fifo_read(avci->pkt_props, avci->last_pkt_props, 1) >= 0) av_packet_unref(avci->last_pkt_props); - av_frame_unref(avci->in_frame); av_packet_unref(avci->in_pkt); if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME)