From patchwork Wed Apr 13 14:43:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp241800pzh; Wed, 13 Apr 2022 07:43:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyRrnwZzW7vPQBlZC/uD2VdGlw6AN4G8mlA0BOJ397ddiBzhYEjSI8BfZcyUBqiqC0gQg3 X-Received: by 2002:a17:906:2ac9:b0:6ce:dc0f:9139 with SMTP id m9-20020a1709062ac900b006cedc0f9139mr39765687eje.206.1649861033524; Wed, 13 Apr 2022 07:43:53 -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 c15-20020a1709060fcf00b006e88ce74cb9si92480ejk.205.2022.04.13.07.43.52; Wed, 13 Apr 2022 07:43:53 -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=aAjv453l; 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 33D4E68B3A2; Wed, 13 Apr 2022 17:43:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2021.outbound.protection.outlook.com [40.92.91.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E806468B23C for ; Wed, 13 Apr 2022 17:43:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QguqoCFaqSm684foJxW7bEsnZmTgc8wVY43b8aI++DtdBk6EcBVMELu4GVyJJDzlQrVNoeGu9xEdixDpE7alDAk9HncPu5lHmXCmhuNyFqc/s8y1tSPTtR3CgnjPkcNPR3q1eXtlti3uW5X1JxH5LTHtLMGjz+4V40ZD3PwZZo3uVmo/y3VmXTqMv4jORLgGp3jTZgbahRipLZuYAkkN0lCAAZ6ukTlxKe3JezaVf/tpRB4uQMUX1bWSsChNeSqgnGZhQ4eYmRjKylXyArV16YNvvC9P+YcYLZMKnyn5BnhkBou9Dc+NmX/8eT3fZYXVLsZbxUfD49QvaibIMmYS/g== 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=V+GQ87ONyGW5+Wd7XeWS/CpfBzUvN01spJ00mXy1DDk=; b=hw/D6AkFHjFQlRunaXxo8EY/4h8hhGdr28kwYkxcW9fiKJAY3WND+9hsUegZkSybNkXDhMzmmUeQGazjf05AwVTZIndS1snfBluQDXzPEx0dr3g/vmQ3ZaHeFjaPFpuvxzh3pKwpuTBJoZp/nj/rxDjdVaeGywaqYm4fQKtIrKy6QVZ0xFuPY7Uqbx2EuZcjcnyruOe1QEkCUUfUUX8aB+BpZU+t9OsJOOPbTfNoSmcrb0KKYAsiyypv1TNufVw/tllFzMS7YFKgcaKO/dc3/RuIJzNvjutRrV3hfde+JXTyuEvM9aiCP80G6XvGQoNZn6lJ9SDeOXNDSnh4C2teeg== 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=V+GQ87ONyGW5+Wd7XeWS/CpfBzUvN01spJ00mXy1DDk=; b=aAjv453lJ3OpvCepe3e+8DIIwSLOiGh76hIflwZzH/oKiPglcPwF13ePcv+DBv6d1Bf2W4/dp22IKOT8Ve5JK3livf0/AroyUNvyHD+3F5HWooq38yQgmDdtXv+baDDMUWrANttMg5v6Nn3GvHP0OLquobjIn45o8LwTAytDdz+k+k02Ho4cMRKDy4fBpeK6mRK9es32eSayRoso3HvFdJcd60SscXtKFBZJgYeQagXuZ/feCWGECmMpPzkgJh0p7ysHgC9gfuSq+F4ynH0Ruyn4idjHQHCbn5qJL1irUq6qy4BenxfwdWy8KB+G+82KkwqhnXp1VF6hkOidOaNHmw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AS8PR01MB8506.eurprd01.prod.exchangelabs.com (2603:10a6:20b:449::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.18; Wed, 13 Apr 2022 14:43:39 +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:43:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Apr 2022 16:43:28 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [zls+jnyfffdJXzeTewBAxcb1QLq8PBvQ] X-ClientProxiedBy: ZR0P278CA0055.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::6) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220413144331.968772-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 58e4d9aa-13de-4472-37d9-08da1d5bff6a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4UWeoLbFMtTy/GVUaPQTcU0xWb6GGvOzziK8kuSuZCmjPHmUJyqnauyQQT3XA/kWe6VeSwaHAmQbGAz5jtH1DrfNFfIlDV8bWyIvs5latBeophxoaczuK62QY52EaR7z5acvGuMuHo7z45s24jdSqbTUurLogj/ggc4ixob7GQC/Rku151rhIDZypOpWD5W+xdAq9DjhYYv/thX7mDeLfB+zskc2MEaJEMOTaTvtnJBAFGgQQps/PX/mXGSHrhG85zpE/YARi/hB7dQ7zpRoy55mF/38P/hoZR+90rrnzeJcmTo/YwU6ZP25Rw9pBxWwneE8+sOwvLPwlsDxscAg3WUxV0gyMfyL13vNg9eIOSTENbF6FLGTjymkc9zuWUYmT7+cIR7xkZ2MmdT9vKS4XFQYCIwUmaRViaW+v6SySEpbecn8ssUhBdzclOv++vRG5umWSSP/LWB/3e+QMQCoUFKbi/DLNZw5nw6wt0xqohdl2gK+BOOfP41elbrMSENUVGyd36NIzJ9vxqQKcYhuBAQpjX/oTzqI3TtKHITymjklXyFUESADO8fMONKhZ0cvhnY+wYiFd+K67R66tN0i+xRPv7UI+Xgqj/3ieOsCUVuzT/3bkeg1T+ZSbKIjSOpYxgjE28uQljfuLNAB4cRU7BtSKsZ3VHBmEQrRnQZacacwt4mKkCddhBDwDLlCBhzs8WhTwN+lJTR53WukR6BTlCFPBa8A4MYGfs/6//cQaxCFFTJCfWfhOynVrgyEfKPk= X-MS-TrafficTypeDiagnostic: AS8PR01MB8506:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jWBUAvU8nYuDI4yk6I1c8j2gHoBKKd0dtorvJ278cPvrMdwn9/uiZF+akrHlRsXPWhVWdCWCix+vPzrV+5NRUezGwD890mzuhy7QLlCNU06XUzaWDlMGsaDYMXpTaUeyp0lksOp5xxNvr+Trd6BG4MWU9ekJxTPcSyVOnkw1vGwivb74cxgLeCEQ/l5C2+6V2RVSZeXc4+HvukctCnEGqpnbVBfBCSOTMzOSKglXvF7AQTAVI7u3gni7J6ZnZebpa4UxOW0PvYPuhg8FKvQvdSy8C6T+ZxatAFjPFyHd61fmMwbtClWRTopsoBIpMLsng7JDbDr8LhbuN+6pQlCiitRMOJysRggIJlJPjE7pw2YDSYjSCo27xQTxuy8lcRZcJpH44FOfeG/l6DB9hN6ZvHhnbnaNOf3qyLsa6ekbh+AAUW7+CtaxzdGybn8G/htQ+qXRElb0nDGne8dTTJ8TCNv0APmLM2SOikx9No4OKFKxr+sBU5Mqg8fqLELcH7kOwI/fPsBa9HzxDMUPLstBwsHmPKE9Tz1cdy9IJDXVg0UjqFHKGtujFAdy0k/syZylTPOpVX1XOf0ltKcWkjrVQA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x3evu9zl4B6KfxJ9XnGZO5byjVeHDWHxfyqrFyeWKNmtmjVKHCWDGjEfzoE8ICNGFTCSENaN7joY1/hbHcD8lZ3X/y5z7Sf1onjbH2mghCmO3iXEjv7H9SdKRwB0sYStANh7IeZv49ulz3KwSKEc/t4Re2F+U1jEgzEEHfVrujEIkywFv10nC+1YUirJntkAHLCrQL3DtRQTXZ7SrKRnLAXN8Uma2qkIdLNWRkgbvjk1oJm9NjJpDZlheTqVD0SA6hjAqWkLSyEOlsrb6YvZhnToSyPCk4bWJR/pa8pHXOrcW7eeFj+bqzJ0vBfdU+T8QWgB6yrNh4AWOyKSm6MYb9c8zKoNB0UYEAOqyidtVgqjZYELFtjsDKxO/FJYLG4cHcOJnQHg+6VrzmlNUHqfJw7NBmMqy2BazKSKLP5yFyD7peQwEVLKVHS/k3ZxONFMpVgJEckyoRzL5UZfWQf1SXhyYPwSO0/q+Dr4sVUYQSDFLr//MWk3gr+Q44ywW8SNz7VsF3W06+8qkRn9yuwtZJk6q0RJcoRxNRIyjyXSbvd1FKWxgbsTr5lytv4JHa0HA6ACf4ivHa6XPDuScCtlPIACW+E+OYBb+dLQ1mtRmM8ZbA7tUzd4VGLPGhBv9Q3c/8AJOS4d8eQrXoAN0P2le6iLXOTRBAr+LcK/Q3k0fSWGg2pQVXTtsi6NDeFHhfqd8SYaBRxyfGVpE/45NjvhixlCb0v3dCTPBbT7zwu7S5S52MJ0O+65sz0cOx8E6qquDW+rK44SN/3O4xIHFQHuxnW/WOXGv2gK3pryY7GjqKsILrxB0hJw0yBhlZhkyUZVfzPo/lrTWsI5CezHE8AqWjizl+UMdm1xJ+n0QO8tPu9K14MUwrLAbXRZ3gbao0zFCcmpTyktTWBrmDx8eJfrNx1Z3LTy0+7qhXOhEUqsdhKu8khilb3s1Kc6hVDuL2IgaTR+/+VjzmEhSt9GOiNJIU8SjnM+iVbb0FLgRCnoE+kUHsjOMrvSR2Jt2Ny6p6j6IzmayjasFmUzshV/B8O7lq75nxImHDv/kP0mD8l2IGKzpGHauWfKBptOgElUA51igYPblzWuKHL+GRxobg0N/fqvWLrkYcjJbpDpLd1gZ0QaULS0yMnRmvdIFcInazkSSQoXZE1ignLl8v8PGINTjttJVVPQ3VA+PtjwD1d6hFVo4cQYNJPcizpSpKm1YCacZ2/r4Pmug+GUK1+QRSHtxz1gLGiVJgS3jIUUhFHsXs6wezH1woWZvoCZg6epiZYexTwtsMUXV34cX+Jd/+pfW8ZlvU8KdJpg/c8HS8RYySyEYh+Os2nxD+yAqcia3kr7fImDxKms4HkWOrSJBfs05NX416jUcO7+kCM8IJrqRzevwo0rL5vhlC6D6MmBIdIA5sl2H3H2p+lqy9yv5ffJgUVso2h+7ZvGF2Lda6KF4bBH7F32UysGc+XhmBKL2D7E X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58e4d9aa-13de-4472-37d9-08da1d5bff6a 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:43:39.3552 (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: AS8PR01MB8506 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/encode: Fix check for encoders impl. encode-simple API 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: +P/fLEegmtDt FFCodec.cb is a union. Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 6ae47b736c..e7ae2cd4c1 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -589,7 +589,7 @@ int ff_encode_preinit(AVCodecContext *avctx) if (avctx->codec_descriptor->props & AV_CODEC_PROP_INTRA_ONLY) avctx->internal->intra_only_flag = AV_PKT_FLAG_KEY; - if (ffcodec(avctx->codec)->cb.encode) { + if (ffcodec(avctx->codec)->cb_type == FF_CODEC_CB_TYPE_ENCODE) { avci->in_frame = av_frame_alloc(); if (!avci->in_frame) return AVERROR(ENOMEM); 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) From patchwork Wed Apr 13 14:49:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35303 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp244631pzh; Wed, 13 Apr 2022 07:50:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdVbhmjQOTaDwY9n9LPAi8Ul8b4KKMTw9ydVrEBudDjC+za5+lfcSMr37Ra5cy5IfhJHVo X-Received: by 2002:a17:906:6990:b0:6e8:7765:a709 with SMTP id i16-20020a170906699000b006e87765a709mr17556444ejr.72.1649861422697; Wed, 13 Apr 2022 07:50:22 -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 z23-20020a170906241700b006e8ab12f932si118148eja.122.2022.04.13.07.50.22; Wed, 13 Apr 2022 07:50:22 -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=Ttoj8mCy; 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 B395A68B415; Wed, 13 Apr 2022 17:50:18 +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-vi1eur05olkn2020.outbound.protection.outlook.com [40.92.90.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9CD968B40F for ; Wed, 13 Apr 2022 17:50:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B4emGKwwvIKrCJH32ahuxQIfnCzAm6ujArGAjhPO84HnKSjXGxMcLuMEu6kg2RC1R+5V5+YV8Ttq/PnLxFm0j2fa2rR9ccCAP1IQ4UwaHoRdOPWCYVNWJ0VlrRBTfbdLpe4tUCHzaCLDyY6UfgUsXonJ7fgmggOI1fuA61hE0DmWgrbGylfehoDj8DGaOn1ucwtoPPz4pc9HHijXouy1eVfd6reFZ/u2+oOIKm84RdtgJgbndpY9tC/s0ccEDCenr7OanvfwAgenBXKUzeT1mvmvNWSdC+JqDVJvWXNcDDbgq7aJZfGwTUZx5jv8y4I5JUZzibFTk0HgH5yTmvBxJg== 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=5Wg2Hu+qyLcBIjPa0HLUoMh0piYSzeRToABmjagJZSQ=; b=UTQ1KBXXgqlJnkPgWMffcdSJsFf8HyGY/yvyL/yk9PMq+GNvfxHAvp4k/0vVuwFuMp8K1BbJ5A2ON3hcBzrHduLt2rDhhT3J0PI0XXVhRvEd6UyXJKlZdhSVwb8UokQsiplExbx39bm0lRQaz/yWrIVuBDyYEz/qW5UY0RVsqEsZ+AndbgqGcpActeY+7HKJDDuls4tf9gz4SQSs5Fg5dyGCXHMKuG8HRkVq6MaD3a5fy0SbFug3UvrFL/R8ctFANc4kRRLFjlJpFrHPE13wd0pqbfgn9usJQoINw1ssl21xqZTifZpngXD/uhkdlhPBr6M52shMJuwB+yRG2ePwDw== 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=5Wg2Hu+qyLcBIjPa0HLUoMh0piYSzeRToABmjagJZSQ=; b=Ttoj8mCyO9rYAYDJ8Wp5RUndK/rF4zKSmc9T68eX+pcVPwKjx7ijRh6G+Q8UsYeJPOLrcKnt6LkLLVNWUvzTtQrNd7x8YP8rTDIsdQoC49Z0Rw9cT0lQS8xiHKpGVL7XPj/gVvsulxNRCzfpYLO1cnXMiTsYvTUWaSNVuFfSD4t3EdEp0TayFz1OrQWu/PMSxZgs2Mbj8JDkabX8R7/Spddk2oPa+YQF0PnBhe15IUVdGnEfglGkwK7AxUYMcTQApMmJsr6XXlJZJnO/C6xuDR0IiPZeqjOLH1q1iD8y52KErc9KZFZBH3T2JZpAPrpp/5iM7GSwy1vK77scjJwkEA== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB3917.eurprd01.prod.exchangelabs.com (2603:10a6:802:61::31) 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:10 +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:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Apr 2022 16:49:51 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Y3oBI+fBvCV3vHf4fGQIlROvDkZe/xsP] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0dc248e-5d69-43af-decc-08da1d5ce86d X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd9ik/eYfNsWv8oGEABRKr0kcKQPcC6Bc+26h+2txn04V5i6nRo+HviT1kyEsrAzUukF+4kvBbP6svMF415/UMx5x7fMhJM2oJR+f9qy8F7aI1IS00fPwEUuIwuk7ZVGFeQoRfdTU3ZAeXK9XC20LpHG0oWvkwTiNP3Q6co0B8vifQgeUQZBzUXRyC/IQ23x5Epgu+ByZGMmQt1azn5HgQbdQddWLbmt3jwDjGuv6A6lWx5lMy+fcRwBk2MYIFVwmX10Q1ucH54vtprMxTGb+8JFJziLURdQpC5zI9pY1iSccU60vYoEyGT7ECHmU/whkedHNzCREeOmwvdu1U1YawHBqCgDFHsgLwB6VTZhvDVxpE45N69RJHI6PQpbiiSbmUGbsGWPZsdwgJQ5jJcS5TT4bdAc3h4v5i2c2ESMUSUIH8Ys0gHBps9qb3aPwdGL+2+/Ol30kb+oorYGSTpS/nvpkJ7JaBJKdsM/5rQoZqkCEFE1Iw0ou59UNAQDKqdANydMMJVOblvF9SFCi4oWV2HXBtBp+S/PGAsGCbzz47g3Z0iMtm4Aj3Uo8MPsBUBL3NmMUEJkoowxXyQ+FfdA9coM7Fy54FDzHscFKThEo4lHfT6cK8m6EMOBc7G6Y6eT34WbgRcdiM0+bIZfte4XRMQPrYk/TIVDpdLALWrR7+Hg5wFHT71ybjHBqmi79nJ/oCxvkIlzVw+9/Dxsfizyyq7BngrUj/jXa+eCrTlHVr404n/0/XWhOK/c28s7gO92wGsxtAB0eh04Ix6a3PNwQiXxzY3sLBomW81DhGQ3cp3OcL2ihg6lQ+66 X-MS-TrafficTypeDiagnostic: VI1PR01MB3917:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ueuLtq5gZpnWjYrJ4wFiGoqHXWHlQg7zy3JP3klCr60opq+PVQj+iwnMyVXf8EPCfmZFaKmn/ItKYALL4cc6tFn6lmks6n9CCZshl2ON+PAdzeY75JTRzE6qAVAxnsuD2cm4lWNGb1kamr9zKGuPWrh0iBJM4kmDdOgrHOZNdVEZGGrPHaqFS5vw7MUZNbr5Cb/t4gWlfTgWMuaovtUCbxTuZJf22g5Ak6hl7W2N7QWhc5VAjwY2PVFOIMmI/B6zrZcJedc68kl3+1d7bLCnixoM2z76leMn+nkHrxCaeoIjsvcp2pIwqpljnDtZTvA4BUz2Vif8B/dh5GCqYHVvXU6LsZ0rLDE3xTpXFzSHQP7zeVEW1A/svLL0xrvuhHMTSOwicrF/tiZzjmpH9+hWRe2teUbr6J1APB2pWr6i4unF/AsMEiqOjqywajB42AWPJ683a7dSZ/S5e3NQjaCZJLfKuwzi2sNBAfl+UnpCBc93vba9MCb7mRFNOJzk9ZOjesSc4PIs5805iAKQMhsncc2fKXMGSKmIVZd3ldtRgHDu/VPKML9TpDUjda2tB9iB1cUYvPHf+DxVrCJIZ+K1MZHS1Si/EyQY49korbWVhYG6zlHBTFAVGI+Ne+c/OZIc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gTp3qjjVG2ey7oFv9OiULpwqKnknRQG9u7ZBa9Ch3agzqjNQhWC7aQJ5nz9e3KYVV3a21kvc+ZaAxpsNHxeQA2C3ZO5ApN8w8Na33vfcPP/v0311UiiC1aq08LtxlRPelO7WHecIJQzdWThLEjm9GNb/jyURrWzhnbuNcnNZCxhCTD9TTBpGUcx5fQuw7g37Khd6vtH55AqmXszBNWYxdAk8m2g8rNwNSv4HPp3AopsJyp0sGFkxqGXg5I/hsOijW0+lV71kbpPb57c9vg6ZcOkd/vm6RIe13QssDgxAvMuJVF4LFevyX6C2tVrI3n9P/4hMg76K8kRMGMnAtoPOhmMy5PSmIc7U+4oOkymdCmHNNRbnE/hJCqF3WNuMrf8408Fs5Q5nf71+CJyzLSf350SVksxR9lxEYqy6OFOMB/Nc2V6IEPkc1LNWFkyeWeol7YfNAcimfsvPBttnRC6U1xLBzdQBFkNGxxbLBsOFDggL3ajFCP9ZCy1AHVaFHiCxwNBJZ+w5YQIjusxst6Oda/p/rE3xvjOO7U0QpNcC1N4cy+AzO69ZvYrpQWw0Idp+Df3zKVadGwEOa2ipjPMDBiBQ8GfuDbWN9TI7/XXbn56ScPBRQOWX77DnPm63Hmky31XcxiN3jyFRxIDmOdMzFjHp3br6rhnMYYZoBbgjohsPz1dah5BhbdxlAx29WddxzNwpYnZ8HXF6IEBaph/qyDlA1vtFn3y6c8WiXunD+ugTV71KX+DsdPb+K1KL4ND+NS4Z1tTvUk+2TlGcMiyVlZlB05arKNurBpgqn2FEnqBATjh4Ux+NYzED7tz+PMEbKUsYHWZCr8yogd94eEPxyMWibIbAKIlsthsG98JI/+2Y4BobmRxl77Eq9xj1FAq3m3Q9lb4rdaPZgOqv9Zw7Kpwhw5lYVktlk56Mx0RFkqn5NuGiXBNKvZ1OM2ewlImaTK8Oooi5hDBuV7dno/Eh6fDa3WPpxCDsGO3qnCs4KoRh5zPZvrbJVkA7NDSwxWJ/Sn13ZuV1cw6T6ePpbJq4NwhNpFGIFFmim0BNymNFPfZMmx4RoU7EWsvuDHaI0UhNFKGmiQlX22NJl/AmLYpfj6FYr9J+ERnPlE72PyLGVZFbvTb9XlMst6FzALeWPrCATvYIVqAuVxdmNDPiRDaiL+q08AvZbrVTQS1l+agtMXp1JNT7D06HapAcXwGKUiY1qtnhMbb1u2TaNnYCAvYMWQYIsBPKBqrj27OvpAB+EdyfsPOI0AY0uD8Tlor+QPM8Pn/+S6A5nd571zLD1d5220lCHGQ1gK6gTToQ4Ea+YhXB/XMbz5CuOppElr8gOWMJQZJqTT0SzT8MAi4ts3nSSeKbXAswnktzRyY8guIA/ElQk/lDr12lSOkaHEGNY4JAixz4EoOesAsshb4P2kGGjKY5EJbME3Db4glBPwUAFMWAbgcQqzE7uWbQzjwPG8k3 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0dc248e-5d69-43af-decc-08da1d5ce86d 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:10.2560 (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: VI1PR01MB3917 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/avcodec: Don't reset decoder-fields for encoders when flushing 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: xRTLr4TEFDx4 Signed-off-by: Andreas Rheinhardt --- Needs to be applied before https://ffmpeg.org/pipermail/ffmpeg-devel/2022-March/294507.html or flushing an encoder will segfault. Btw: All this stuff is unused by subtitle decoders, so one could condition the else on that and avoid the allocations. libavcodec/avcodec.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index ded6b5b307..0d971a61d4 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -422,6 +422,17 @@ void avcodec_flush_buffers(AVCodecContext *avctx) } if (avci->in_frame) av_frame_unref(avci->in_frame); + } else { + av_packet_unref(avci->last_pkt_props); + while (av_fifo_read(avci->pkt_props, avci->last_pkt_props, 1) >= 0) + av_packet_unref(avci->last_pkt_props); + + av_packet_unref(avci->in_pkt); + + avctx->pts_correction_last_pts = + avctx->pts_correction_last_dts = INT64_MIN; + + av_bsf_flush(avci->bsf); } avci->draining = 0; @@ -430,22 +441,10 @@ void avcodec_flush_buffers(AVCodecContext *avctx) av_frame_unref(avci->buffer_frame); av_packet_unref(avci->buffer_pkt); - av_packet_unref(avci->last_pkt_props); - while (av_fifo_read(avci->pkt_props, avci->last_pkt_props, 1) >= 0) - av_packet_unref(avci->last_pkt_props); - - av_packet_unref(avci->in_pkt); - if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) ff_thread_flush(avctx); else if (ffcodec(avctx->codec)->flush) ffcodec(avctx->codec)->flush(avctx); - - avctx->pts_correction_last_pts = - avctx->pts_correction_last_dts = INT64_MIN; - - if (avci->bsf) - av_bsf_flush(avci->bsf); } void avsubtitle_free(AVSubtitle *sub) From patchwork Wed Apr 13 14:49:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35304 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp244721pzh; Wed, 13 Apr 2022 07:50:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPbKIT43nXv8DVOV9h3M1vBUNn1+dhOHl2Tl7AuJKdavob1WPQZX3IBB2s8ESwsdgsEehs X-Received: by 2002:a50:cc8d:0:b0:41c:b4f4:c874 with SMTP id q13-20020a50cc8d000000b0041cb4f4c874mr44371155edi.92.1649861431611; Wed, 13 Apr 2022 07:50:31 -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 f21-20020a056402329500b0041d60ede36csi1970501eda.24.2022.04.13.07.50.31; Wed, 13 Apr 2022 07:50:31 -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=hwqgcurV; 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 9BD6868B425; Wed, 13 Apr 2022 17:50:19 +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-oln040092068061.outbound.protection.outlook.com [40.92.68.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 054AD68B3AD for ; Wed, 13 Apr 2022 17:50:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aRXc/iHpozTgTD2ser/S6wbnmXZi4AjaK7QvNrA0mIttqqAOXMyueMQCbO72n/IcTmYSymyKIBsRyoLiXfor8gmNdXV+JaAIiqzWuRcFZx7NGoLkkMJMeEU8Vy9+c87GBM/zYr/sra/JgA3kgHrQizRmsDk+PI0M7GgfXMa/P9RtrCqo1yHb3bhrvzgwwqExBVzjS2Hfw5m0SGPM5cmOWk7Zc0m0RQbhiNa2/ZQEnBQsE8qXI6CSBCeTLDY9XlZG5qmjOVY1BbBrgSkQnznNoh+i/bTT9nUnoE0pKoFPlH64CrmpLf9wRJCqAHjpfJ3rCdT18bn13QjTLokkVawLdw== 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=uV6cewTBMWtJVUMw3J7aOZhHB/vmWMz5JRviKMF+KGA=; b=Ws6cKL7ILM57OX+XQyWWhgCpLtlHcIWBxh8wkSVHyp2BwjfGNkXy/serityA8drgXLFAFidDUCTHji1yutP2cjvzvsmBF6uHvv72XSOOCbHaKgizpw+iK4jvZtaRgpWqj6PyJN4TiFEqxGj6nK4896uyeVFH132zt2MPxGmJDYS0l+KzZCGEfsZIl+URlf4fmiaSMlSnMTGfjcjnOaFkpUBAxvvh2Cg3zb9dHhq+UC9ekiFeA90iaOt4QkAEwS5ivhV5QHdaTnHd//cMj5n+kqvfJLKQgmZN4++9h32L8rarq9z9jBJnSZUpItCiB5I8Yd8mV9aR9UQJXk1T0Z1JPQ== 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=uV6cewTBMWtJVUMw3J7aOZhHB/vmWMz5JRviKMF+KGA=; b=hwqgcurV9cmMOStZD/oAdQoubXfmfrGG3WDaaJbv4l2rEu3jkytv6x6mXNYmiyaS0K48+tXOLPavGnJZV5PqludWlHMGbU0AVLjl7oGrSG19LLiXOMtbz0Mh5SYJv2xh+wfhbX0zgILdFbwywyGBmmp8iMYDM0s+06pIpuoC5gxqMIWLVJaWaSSlfT9P38lpbQXQEHZxQ2K8F4fzp0ZxdCLHCqWAu7xmWQXW6RhGrAan/JivsjDMbykm1nQGjvp52kf2P3441pOanNjd8GoqOY/UgL1qyn/wUrUzXrNrsFw3yj62VUXJfGNnnSIkA84p/T0795WmiaVgYwr4cXwPVQ== 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:11 +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:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Apr 2022 16:49:52 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [3VZYdGjCc0yy5Fy67LosI0R8Thg2NLCA] 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-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b696d26-b60e-4352-9de6-08da1d5ce92c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4UWeoLbFMtTy/GVUaPQTcJS4JAFXyMIBxNUKNnNfQJviNj9VO9Cm/Eb9FFPB8Aom6rO7TBDqZ9dptLBpfB3T8PN+SFZENFsJnnTWVpLRTaSc5oeiBgbtFTYc8cs4zOI7LUl8qq1MGUtgfTEn0i7UOJTYMs+Buk0Ig6S1aCvd1hwVcyTTZJqzVUbaE47szmsXJrBybULhIA6mIfO+aKsXqjw3IZqIpx3yg3D8JiFqNPMUPqlFl9JE9ullUI0z/T4jj8uufz0ktcC+7qMEdp/10uE9qWNAAyydKbySG1ZnZynE61m0gVTQwWUHjCOjFCRdER07ueRCE0mRGbvlUh5sYPINfRl6KKFeuf4xKPSLdijQZaC14pPMrD+YDwIN/1yQnGFXBl5Xgsb9ulrfiNHcSNqez62N480x24HAErMq2u/Bf6Vv2U/gjTG4SRUUFc8SLqTa7hx3fPylk0K7qM4AQTVcvKoc9AQn319jch81WwST3WD+V3y295Wep9zGf2aOUNNi9VBCK6y1wAv0c3plu8TtfpZEFSFGAQAtP+LMxn3c9VgRZ2yzz9iqssav6UMNOQh8CtwpDnw3o2fX9TXmaEaOs00/ECg0zYx41rJ93f535nfTKYFVZNe68UI3ybbRZbJC/FzDOMysg5EA32Bu3AGm0xyOL7O5iHUC/W53wJD/z2chT4ex6jYuBzBV8NKnLmj7wlNyr3jes2Y1pfR1vJ7Y3+mODGr6k1LC8xYqPeQO6cZaDPj1Ixe4afwoS6l8= X-MS-TrafficTypeDiagnostic: VI1PR01MB5391:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uIOsqjpPu+Tr/o/spS8yF8whMqJbeLGl2wyjFvZUkajB7pK4fhJZbHa+ysUtklt7SdXArMwef28HTw+cR5MgRAzXRFMI20PtSISM5Ez//UaCQuE0XN1HeGOaIedRS4uXf0kNN3qKUbcruygXWFqGPyimJli6OjLt+knzf4wS4R2EEbcLfYoWTsSWERNgKewfQ+1YWWeA0ZGg37OKxX44G6UNR2UuCcRoF40qTjVHZg4csGeY67krQcthovB9NbzAnAaPlvdnUf4PWtJF7rkRfG3w5dTxTJgySq5iCU5xpDKBYhEge+9vKw42jJRvffqEMVnzSnUbMEcbzS4La6+oIq1Yzasqm/hujnTtu1ZuffQZg+hAydlWKGfK3uvVbJWNiMdGrs2MV/LMQ0fcmf5kaTgEgBoXxeH96qDA4vsxFsvV8gLCu174/0L5LQ3CiMGWuZldl+59IFzKFfyMKS1VhNU0AgJAw4tKN/hNyHW8euCROcCVLmYtpKoNhtITHtc9tg5DJNSq2LMnaTyDzu5nZmTjiSUCyB1wEzXY+heH3Ifr12dV3ZhTXf6ZJYlcDltFY73/h+fX9YzkaD8QDp2OHg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IRhfUvff4dnB+4ZcvG+AZG9pcbmVMHPFoduZ833HQyNEQgCDjgwZi1YgQcUWBRUGd/1zle0/oyb/Wmb7MoYt5uRmIEP8JtbuPka8Ct1codLeNZuYfqnszPPtW/nZOoqR6AtkZocRmE5gCX1S9jrsgFfzElwOC/XBK4etpFF8SUMM+X1Nnim5bLpzcBGQQeKDDEdl3JNKqyzX8OUeVwUKiKxiszvrJHSFEZ35eG4Lha4Sw6TmKhYT2rOcPKa1DHhvUa2cdg1H8FQxSBuTuml+n/wJ60m4szKoyTwIz4uKu0TRMquS8kdgG1Vt59B84z6hGdN3YVi1DdrsZe4GMmbo5li3DFN/jtbCelwyPjVy9bf4hlW9UVf4wN4Kk0cUoCmPuj3bSb9pgrRI1pcHquCLJO+b9j/BQAXtYo80C/JQPl0V88S5iFDohW2hP26FCYpPkq5YVlwcAYYHXrI296tabjN8b4Ud0NnzeHOqZ9BxnksAwXcaGXAb2dF1UkS2p//1hC3fDCQlNSouFmdu/WTcRD76mBljJUKW3VFDpzY3NKF7C2SeOHD0SBP12vmDwGOWvZjtYKE2kT7N6JOdxJtS9zraBg+mmii18COoYf0n+nq7OjEzoxrkCqrF7KjBaa43LKKX3Z87jRjWccubnj2GzHuAxkZEFTJWo6P1jDfwevTBFYc9fMJlk3SVd1yPD7E8XW7lOF8SPvmpXhw+OWyFjKSBbPUl+0Bq2gxuBLngOE93DQnZGha6kSq+S4Hqg5iHt/QqcvVPsuVFJ34RG4j5bvWBon8OHdqOfG809bkdYP8eUNIwwQBk4Za9CuAVGzjXLREg1raU6rGWAG4c6tgVCtt7FMHU46wwaL8qwR3v/rAshJgxaPV0h/IfLv20yKXQf5V9175joKlTljyK7xclPjF67wjaICD7LYQoUJZw5EUJcJ2ERTLARD+7Z3cMqmFXQbfUgKeF16lu7Il/+CXnRXj3rliiIyhqLiyIcMZ9YNMJ0jk1yT9P23zW6aAicJ8RGaEtwHSFqwIj/+EJPHdHcQsK4kc7tqSWrLXV7NyHha7nOhlMEhvkDNu0ez9dv1NCJIVBdKb1e0oCRAGylexu5eY1wexc4oocUh/PAwpMe8aFziMHbs5swxZJyUikrj+j54rtddn6BhlwGeaxEO5Sh9SVy3fNRGSF5SwSTLnslorcUtH+CLzDe9uGDeQKCf80rfb8GgSf++RHD9DfEm35gcV3X/G82MwrS+9LaGz5bDV0KLyBExcd5EEZ0UpN4oDQkQJbQV45B7YgtgJqo/UQN87HB4xV5kA725j4RX3xux+oTPi/fdVEX+GjFj7TvkqfxBfIrdppm6jo7lm+91uq1XiKqFDN39j+U+o4FzgqDA/25irs92gmzztS/0DaS0+rg0ycUG50cV82fk8ENhc+bE2lNLGz/HcjH9UGeKunuEjQfqOuRrxw+YxhLUZyUmnJ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b696d26-b60e-4352-9de6-08da1d5ce92c 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:11.5058 (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 4/4] avcodec/avcodec: Simplify accessing AVSubtitleRect via dedicated pointer 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: +1ygtiTvghF5 Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 0d971a61d4..d11f035481 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -452,12 +452,15 @@ void avsubtitle_free(AVSubtitle *sub) int i; for (i = 0; i < sub->num_rects; i++) { - av_freep(&sub->rects[i]->data[0]); - av_freep(&sub->rects[i]->data[1]); - av_freep(&sub->rects[i]->data[2]); - av_freep(&sub->rects[i]->data[3]); - av_freep(&sub->rects[i]->text); - av_freep(&sub->rects[i]->ass); + AVSubtitleRect *const rect = sub->rects[i]; + + av_freep(&rect->data[0]); + av_freep(&rect->data[1]); + av_freep(&rect->data[2]); + av_freep(&rect->data[3]); + av_freep(&rect->text); + av_freep(&rect->ass); + av_freep(&sub->rects[i]); }