From patchwork Mon Feb 26 01:20:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46533 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1109514pzb; Sun, 25 Feb 2024 17:19:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUIcTurF2s6/S3zMYXFHeswf7JFrmf+ksFACZ/G97ruJd/HCm3pCF9EIR/L8nRyXBMM1CAnKFxd0pap5x8j8B540kHooIuRlkZJvw== X-Google-Smtp-Source: AGHT+IEofyMXL4+a1+ip1Fks/az+CaDeOGM2BmZgdxD6sSB2J+dVmjiFzQKgEYRyp5SYlpSerhUz X-Received: by 2002:a17:906:5397:b0:a3b:b215:6edb with SMTP id g23-20020a170906539700b00a3bb2156edbmr3152208ejo.6.1708910349574; Sun, 25 Feb 2024 17:19:09 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m17-20020a17090607d100b00a3ea08a5d9csi1667302ejc.54.2024.02.25.17.19.09; Sun, 25 Feb 2024 17:19:09 -0800 (PST) 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=euVcRy0N; 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 A3C4E68C7B8; Mon, 26 Feb 2024 03:19:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2063.outbound.protection.outlook.com [40.92.75.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7A2C68C533 for ; Mon, 26 Feb 2024 03:18:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kfJZ/lHR7+eWicdRphNxzzk4uUAzqN/DGl3/UgoTjl1egwe/TadhQKiheBRPlflz+JP9HLK4svLmy/GNVyFdTP6MU2B7EdsWX/hj6rBG0QCj0BJx3VAsrekKEYjkSD/Rb4rusPXU3juIhlTmDjgiVIjs5l5fRt+z6Rg4TxhNL5Oe/SS2NwjMJvqkCMkzi8HIohqG6umGnx5AF8yAdKmaGW3Vt8BiuJibysgVtxBwmZORT1ulTaQSOB8igv2RGwh3kH67aN/14y4R0VOItK16UU2UyGFbCCxguCmC9rJIMhSNSGaSRQNzphI7nDuorhGRSyYLY2IMm7qlIT0SJxPbfg== 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=ELA2fWXD5Epw7bqg1OBh78FohWuOvkS2PKzo2Jxm+2A=; b=Hu4xJQJ4FeEoFtdqKtf9ZZ1/Go3Y19QTHd/MprO9+NXUa3pvBEUCTkwXL7MFs2QNHS1X/WEWDaaMLh3T12CT4WfcIGJ9ehoi7CPTJsLPboV8PkBWWGkRS5ZpVU59z6Kqi7XhA9JOfg01+dQ70eoN++5Xuy8p7hy8FoJLmPc7LMsqjVEKKIA0IDyCQYM8mFl9zwHECoWccKeQRv4MX7jqRt3VtaYwmLTLJZ3KdWpVzGBlvf6JDY5xYM+sB4zWYV5EOFd8eZLe9ioG8IpCO2LdlZWb0593xkm2Hka5VanQrRnUgbodNj3/4uVbH23ZMLdSk8GDJi+blxFnCUw/ota+Nw== 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=ELA2fWXD5Epw7bqg1OBh78FohWuOvkS2PKzo2Jxm+2A=; b=euVcRy0NzPWywmg+pRHjP8mZ6QcnjX+mRoyEFukTQdMsjlsWPIJZM6hS/h6NnJSdx+44bw/PE8h8SDUmufp5cBIu+s17ilM9yAeFG4hSDUBFqzJ5dm4i3Ev9+8Zm0L+Ez0qhoPvCiO58mGT21e/ny1CBli0Hmv3waNoWSyDwHsMCyldPvRl7w3ifRQPIdo0N5sAiWWrUnsrCr4vXLvjR1cKqg8HQLTNHqHsoudDiEb399GDls7ajfILUxezu0ICIvdmvVJAi2GRsS34WUGsx6gwz6h4hV5Tg6ijuAp+gkUcEUGSUblOTaOcT0Tg4yT9OYqIIXmzGRFHSGkWfRmgd6Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0275.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Mon, 26 Feb 2024 01:18:57 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Mon, 26 Feb 2024 01:18:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2024 02:20:42 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [N4miR2isMlbkH6Pl6ygSMa1AjWXWxekeVseIxXMViCc=] X-ClientProxiedBy: ZR0P278CA0080.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240226012049.4055448-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0275:EE_ X-MS-Office365-Filtering-Correlation-Id: 364ecb4b-e38b-467d-5427-08dc3668e77b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h7KkmArhg17+cunpibzVIc7+r2Ril6rSr2N+ExkIDUr0mxhc6eTjqg2hPiScXGoAS7XYzHkHaNCMIMszqnFM/829I1XoYY601k5d9B/8vAH4Bx3O6fBxqTF4joqTDqQEr7wO4KcQ1c7WIzap7PIQIeZ/RD3oe+K7mW4HAGk+8KEPzU+Jr47WxYaNkEg4tzYblGlswmcHhQEcJzq/LgwWvGG5rr6/+Msc1JPuX/ZB6ctmH6/H/zAN0fVZue4gVBHVfJUed2ev19llHqs5GyipicOFVVw9BtLEvMCfiyuxPgCzn5/yu9FEbbBowb8BxDLPtHK95psoaJMOEuPu/zuq/3+tEXd15a0hUeFVJ4l6Nxn71R1BI/Up4i1BdDZfZ7nNQ5IfvmgTWej4wjrQzPJetpSTgB17KMTRHrSOUcxyWzju0H7uJO1EMCbSpT7CO0Gv0/zcVP0Kbkjf6H++9M75HLRlvbZtSvAPAmhiU1uOvS0q7ga7zRbQdcpRuuYwpMSJg0Tuqv57sJlS+wHLajygNpP/DW1A1qcFq95PwPnILTtbG4fVD42VvZBu88lIZ7e4RVWjfPZzvCoRzOsZRwskiZyZh+HmVASJwIkftkGBYYaFiHuc8FvYd50KOEBiZ+ueeDvjdlddZq9JvbT6UlabSiQi8g8bl6T3oHE7vlmr3EaFi1PGSP9ztV6pvzSW+aZe5Hu2Nk7vd6Zyve1uKFG2Rw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +LhZyT6AyaXFEin1qtfgdItVmqblYgYBdVLsfyqjFf7grGJxGE3BckIh+AUU5BgOORFexOJmPixZkHeTfEOI9xGzI4tRq5Y0ofvGlvxuP6dgWC1em831N+ZEmGe3S2DS8jY9LJeT/Duz2a0dtTCb7v1hBEBlJDIBXpef7rQP9ni67uVNRu8wJ77IRQQFlveH2DNHLxgoO9TxX+Y0JPe6zF+iCrchQ+XP7zPbdAfy0w2/IbA1kq7EiU+gZKDeRwF1pukp2b5b5VrPtwPbaqGqL9/F8EdAEvGjpnskL5TVbZPw/ovjg8cUqNNgvsKXfrqDzKkdD7l1X5QtK6dVmrurzjgnMvJuTw35fLOaabTfzH7XE6g7hFOkURDJs0GIAoMz+MTtZtNg35Rvj1lrEwFZCq4af8C2LxphVJjCSluk1cKlU21r90qEAdRTbYNDqu48RdIEfJko3Qtzbh4PF3av7U5HbwgCI7feXiWxsYCSdcH4HOWRwzMLPfJA8AdiUxye+SxW42mDC8B4AsmAoZGD4Ethk8sMukbh5dU+zw5jMUZthaW8lAWwlomvDYMsCBKxGn9A0kuZ2qBHZjdAoPmNswYNovhedzH4Qyd10E3K1Xi70lPsTF6mhkDkQEVapqWUnNZ02FR5pOFioWZbAU6QhkomoTo9/8652er5lDKVWKiR6fsb8kKolX4B9NPXViNMj8xKcnofrBu3EVmFlgvI5a2O8G4jTE+d0qAl7f/slo0FIBDIrWoV9gbrhlt56H8XGdzMnVXj1IVhk2bKbclonIPq5w8Dl3WE3ynMUdP1R4e+MKPBlgDHjV8YSrAjzyKE3nHsdyPwD+jv57qv0pv6r4VEdKF47UcmthZkZSE59oMcQoanu+U4s4TDJAGKTfPJHD7Pgsd1JZbf6Ty4AT/dK/dHCkEnxy1ust8nrlJOstqrkPvHHHPDE/yDCTG0hJSBq3EmjyLhKZgzA2HM1QFYaNlgk+6zf01oNmQFGxokHjrjoeKBfY2GUT5UTOMCsi4goDx84rpgVJ9ejxKQcDkENLLcbMQ2pquxTODzgCyVDFVIUmz/W4eWk+hPVO3tdr9G5tJjmS6BCPF9+ARxt0H5zo6P3aGJhCdgwSaPbZoXDYhWZRaKDpCVT1lUEUSW8lbprG+iQqQToOw4IvJ1ISBoHVAPSgv6y5xTZzmt4iY6rjJXR/2D5lWvma2BqYzCxsXOT7B0XF6ZPiP6fSVO8Coym5lmnRMVneDgfrFmTwzWg7u2dl1AuKTIfp2EkDaG2YneFgcQ7PWM7R1a1RBCJ9mIUQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 364ecb4b-e38b-467d-5427-08dc3668e77b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 01:18:57.0049 (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: PR3P250MB0275 Subject: [FFmpeg-devel] [PATCH 1/8] avcodec/aacdec_template: Don't use intermediate void* 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: dVwL8O8858hL Signed-off-by: Andreas Rheinhardt --- libavcodec/aacdec_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index fa2a68535c..cfaa25873f 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3032,7 +3032,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) return size; } -static int aac_decode_er_frame(AVCodecContext *avctx, void *data, +static int aac_decode_er_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, GetBitContext *gb) { AACContext *ac = avctx->priv_data; @@ -3046,7 +3046,7 @@ static int aac_decode_er_frame(AVCodecContext *avctx, void *data, if (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD) samples >>= 1; - ac->frame = data; + ac->frame = frame; if ((err = frame_configure_elements(avctx)) < 0) return err;