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);