From patchwork Thu Aug 25 19:35:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37491 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp537096pzh; Thu, 25 Aug 2022 12:35:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR6GqxQkYiN0RzhkaqfdgUE+85LWk5yMZI5qSfTygM+PTeU66lvdYCauGFsO82nY/8k8xXQv X-Received: by 2002:a17:907:8a01:b0:731:4316:b0ad with SMTP id sc1-20020a1709078a0100b007314316b0admr3538691ejc.477.1661456144630; Thu, 25 Aug 2022 12:35:44 -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 m16-20020a056402431000b0044723c25a31si215067edc.366.2022.08.25.12.35.44; Thu, 25 Aug 2022 12:35:44 -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=rIVTAEzT; 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 52B5668B9B1; Thu, 25 Aug 2022 22:35:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2076.outbound.protection.outlook.com [40.92.89.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1203F68B871 for ; Thu, 25 Aug 2022 22:35:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iQCZAhztmSBXwWkuUMMlYoA+9BG0zVvpnywCo7hNAjcp1R1vIZo3DWGawIhfuMoqGGpmiDScobQgBjmRZfV9SS6jaOkfp4trN8OjUapETxgC35v4FehoFNNGmvsVRFFiX/6doNO/+O2S3Ovzm8CGDruHatOh2V+U1QUPC0ixfXrqOJLKxVasnEiMXZ20nvJosZow5hkMZbgQ4bZwZfSDOnyM6Qjd0y9ph4GwiBklHzeFxW3qjIuHYWrd4wOY8UQei3612d3xLIbusbObHLxx0gAXDIxqx7BTxydcf0TSx/GiLUh2zZ0qTEYvjjY3xsUBvQlyOO5MkRLRf/Vmacal4A== 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=NghA+ilJwRnRRnSu3x4jeFGaiqRMdLWcyhtsJROqJ40=; b=kV1qDShWBGRbgs5Ftt2K0tHLmPcHUnbm7Qx4aM3DZ2tfsPcEmhaWif8z15HXKuPle46z0AA2v9jTHpr7j2bPptA8p9a+KT8+zWIJYzhYhFDBThyS9HwN7mt7w01vU64YPlT7i1UxTor3QU1uMJgjDAUOc/AvA7qSTH0IprVAsbFr+RJoQqWXrJMjejM+92yi8A5MtXRUMPxeVBLyaEnXgXKydN+lNF0rw27eoisgoNLBLR6le9jBHgbyxCeY3B5HkyTtIycH2tA4lGJcxT78Prb6YlyvWY3Wv/b8F4B8B4WhXazd5k4cFDDUQfUUZUtjxngkwEcX1/7o4lK8vtaEOQ== 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=NghA+ilJwRnRRnSu3x4jeFGaiqRMdLWcyhtsJROqJ40=; b=rIVTAEzTag3S9NxWqu6J+QjqSqsqquSKHdD7AEkXKGFzsh0DLyYP53M3u4JlK42rYnFrwjvsTnGad1ATzp5/MLWG7K7AZka+gAVt1Lb9HBt0Cq7AJAjjE8Dn7KnJ6uNdhanhXtHcQ3OlfpeMSUo/ohgGsQsBHAlAzCiET7wPAIUORnPcmwfYfQHtqx5ZD7ShQQvWalV0/lrBsrPO5KNtakHRTd7iLLIVFKlA+02ctNEhbIpgbZTmdjeEiTM6mOAdMJugl1kVtHrFoSWfsPpMPVI3WjYm/32cnM7C0ZsZAGHBcPYvqiGo9ZLqEnppzWIBujhxn3PLxbSIGKuO47fe1Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS4PR01MB9374.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4ef::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Thu, 25 Aug 2022 19:35:33 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.022; Thu, 25 Aug 2022 19:35:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Aug 2022 21:35:25 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [4E3d35zyBH/nOSGvW7Q+SkFqIN1pWhkt] X-ClientProxiedBy: ZR0P278CA0089.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::22) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220825193525.622224-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e85874a3-2772-4321-f9e4-08da86d0f9b8 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHVlivLbuXywbXxo5R8AB5/9umfyr43N2wAFqxIR7bascVFAX7fOJSXyE/mVZjoL57Hgo7ZSM5WUIyhQswCVzpEodClbqWdqWwc7uO23rLVwgAvAR6FwKE6XzXFa3vDHjTIDTylKMnB91npj4UuuyMlNx86rN42yld/rMyFuAkBRHdVBer/WvJPv4uhx9V/BZNK9/aRUeRsUqJx8iAPD9XtXMfam8rqj7fSQdw2ZhEwZQZqmlzAc6Oxp/2ejEnc21nblIKeKNUpEN9p/V2Zjz4YkGGHV+9efncCksWfQyjQUdZFyW8UIGJYjTAcjomX2XNWZxbulywLkKqQ5mJfxZhdYOnBq9/6y0zirpEU/ejBgO+11DTIT9GKJUDY9C++6JYobmV/zo+nRGPb9E5FCI1qYzEn+y60tyQqlhspqSlxUNeGw+aH1Yy8Jpox7mre8DXzYBy0/1b/fFm06dMmWVw9+BnQqDbZJCDn8KNpK6Bca+oB1E4+pWCbkd/h379nP+kAxbUFaQJvXNafjnUaHPWMAmwZsOT5w2Qx9FvtBRGf7Gmjqx5orq6M480FTwkHxf0WGQYR50rH0HSLeb0r3RywBs2NgtZ8qKzAuks/vOaCSlgkvfD8o5XBx9VEnwARZYXYK5AX81poVtpECb1ctc/x91b4vLrCuo6L+vdBCFijKm6Mx1fRoWtxIK7Z1BPPDVPNH+KR+MvxDlw== X-MS-TrafficTypeDiagnostic: AS4PR01MB9374:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: og2LMDN5wFwp3EMRmpVkthkOKwKV5iQ5xOAE9kP4Pkh+aDIn/BIDBOcRronx2wewn6EaAlpLV95e8uYfrbQwdK95kO/B6aSuz9fPiakC73TLEvSCoDC8zmcdSezmQDtR/sgq4ZsoFJMH1eCcUqe4IOnYgtyBpKptFMtL55BkQ7fJh6W5OApHqd5tXz/EtEMRWFgG3sM+VC5QtKuqJylE0QqISwFKr+iyM7KtiQjpvZw6kmS3waIccVKGsmkPk1kO7xBSk9yIg+UHeAiymNDPvIlZ/4ep1atNQ8CqX6rVzv5QaVbw2X1CK3ZDXJMB63YwUn0PFKMkyb1DWs5jGxQwgykgS6j1Hcf29cwqx0ltEcAq4ACSKVexmt5EUGNfZpkEHN6+v+WwDFa6EL8nDItid/wY2EZrZUbu/bSdYJ1MqMe/0vsOqA87DC0EMgC4554iOXFAyyvzO4jiASj6aqIA97A0AABR6/OrdWR10pSIqHd0CHq14BKVMoKnofmn0cp7GkGRD7yOovKIAwOY2uqEf32+k5c2n+L7jwXDkpQQz2ghW0aEEMcQL2KwQ3rPNklSDWxQYCX3+A+qzPD1x0AqpU7Qd2uIhOqk/DArOSmm44HmNi2NWDMpYy5z/+t7WVFzOefTxmL/tlT3CY57oNnqZA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3DDL4DQ4OYHhW/agkshOCzaMaD1twNLnlOgKKNsZOoxtRJ9XzfUnZzYdmoXnflaSCeai80Eh/0lvOoMypWmm7QABXjAuSigaIaLJ9dNiFztzObkYNb3t2AqgPoGsYI1/0hz+q6cShsD6CgxAfkMHa02G4YHHYpBu77a8hc3mKitB6MXKRfm03JWCb082uWUriFrhdahwI6iFLR52Fmsky7ExbK1Pm+UBOj6VomlE9zU1+nw6MGmPAvO0IpbPe3+Jq5cAyzWcTzTXcy9eJVLjoks3Kn4MsrNqXotrPm+wot+R3x9XXCJcyj+3lcr2r8YaWPPtGWRcC1BHow1BNbXSbE1fv9H4gDu8EVxYYFXbPsw0kTzpOYvYu/DzmWDNlyUY/B5HJT++wn4Zm/lxj6/pf/VLwTGUbZ7cB8zaHnijoiW0AGKWm8Mt9L2xri93dZyLsnOwxoC2YIN7xMnvQE0xw6uYm3axSdeRfxq/hekiaEXzFWJ1p9gRr8GKDcbt4i408x7UfPCgjNWEOtsIR/SPPOWXEMoL8iTIYd3884IhE1a0L6KyWs+UpdcONRziadvkcA5Y3cmYSzRT+OCdN1MYmTuYv/HCn1lba44Pxyg2t/aaKjFUrPMNdPWb27F+2w729wWq5ggT4S28ZzO4B6Hyv/Eu4cwXXI0oO2GXNC6BA4t4jxb2AZ5VYUIzwUqWwinJGaULVE/Bj7g1vciNVfNCCXZTmttTVhKGaWPzfnPeQGPR5p7H66UXMDfP8J7oZksyXokQCBm7zQ3x1JsJdYZ+08XHz94jnqXI1dqhoe8BVZgzs4Ds1JGIPm7Gr+wl8enjsWhT88+XFyZg8dJYFWm37GnMcJBUXbzvEISOR+P19u3Pt43CLTbDzFH+Uy3jPwIHsUXZTtXHoWLVpzI3zCHtGT/S5c9vULR/IoJJKlKSVfTVnJ1xRdloFgBSZhz6cX3QjxL7Uh+tCqFjcOkvSX23I1OJAov6B+LuflBHwB0WrNzx5PE9sByc7gvezt/MVswL7tXHPCvR77zrrQ3K+Li23Hd1KqOMLc3tYO2D5cPn1doAcifTrq4dpBBTTCDVoS52UPZgpmBnSqIDZ/d3h05nZIrfl1ay76fLDMUEjPJ4SRQr5n1ftZ3pRNFgcpPuRKWXZR+N8dnzYKwUZ9GX0K/95BxqdqZVRhrzo5UDRjTcdrk9rhHU2p1fMDBMnraJHRN1P7GVIqztZqmeC46w9Y0OcJ7jJGtzNAk3TIWPJ6jtYxZ+Ps/C32HFtnS7br1iyErYRQ8FixNWX3gJyYFzFwZyDihFLHFV8WOt+uKNKMuXKVg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e85874a3-2772-4321-f9e4-08da86d0f9b8 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2022 19:35:33.1377 (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: AS4PR01MB9374 Subject: [FFmpeg-devel] [PATCH] avcodec/libaomenc: Fix compilation 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: ybzgcnU5SQLp The struct aom_codec_ctx for the encoder is part of the AOMEncoderContext, it is not separately allocated. Therefore 5bab794e4aaed55d3146723974ffb5ad792617ab broke compilation. Signed-off-by: Andreas Rheinhardt --- libavcodec/libaomenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index a82b933c18..1e89b7e3a8 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -400,7 +400,7 @@ static av_cold int aom_free(AVCodecContext *avctx) #if defined(AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS) && \ defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX) - if (ctx->encoder->iface && !(avctx->flags & AV_CODEC_FLAG_PASS1)) { + if (ctx->encoder.iface && !(avctx->flags & AV_CODEC_FLAG_PASS1)) { int num_operating_points; int levels[32]; int target_levels[32];