From patchwork Fri Feb 11 08:50:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34222 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3025320nkb; Fri, 11 Feb 2022 00:51:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyu6oJ7vYVqAdxTMuMSKQZrs4ee+fN6FHHCBD4o3lE2eS7hDWmDHDqYgHicsOP0V3+E04+z X-Received: by 2002:a50:9b5a:: with SMTP id a26mr755759edj.364.1644569491812; Fri, 11 Feb 2022 00:51:31 -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 d17si15629263edj.467.2022.02.11.00.51.31; Fri, 11 Feb 2022 00:51:31 -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=d5fFkJMV; 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 203C168B20B; Fri, 11 Feb 2022 10:51:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069068.outbound.protection.outlook.com [40.92.69.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAC5B68A970 for ; Fri, 11 Feb 2022 10:51:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jpb8vTipGV71LQY2e0I38RDq9xbKLo9njna+7aMZymBE2bxRzr71JsnBuqRx1a8HB+rH/NJgf5FAXWVPk0y7ORxSlpFw3NSbqebYMUTSdeyxjEmAoNHPuwznLK8AF43fcASh8D+sFOJSaLi7r3hUgra2oUcEw/3vNtAlPLsxgUB1FJh/fIQ/8xuN2zGmMKpx8OHiSE2MBAGI4MrjOgRDinNZSSj4iPSmFqIyGz2e29wPIQeL4jmpbEIlnq+psNjB8fEBTHN9e5bMJLbwNoic+ma1WsakWbDa2716RFYjSOJzlCZmUfcHF9thCwCKwTk0XDIGb/ZG3JBkajzD8z7o/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=WfbiWonVGN4SC9snW4sLB9LpR3LL37uoXnZlOkm+0mE=; b=S1RwRbq5b3zOhbVRZQdGD2xMKVFkfnxMCPk0e/FzsP6PY5ojMg3lBJaQ+mt2Vr3fJRejVNkz86aSD58VvM55utaDZp2ATux42Gidb7TzWQnmntwtOvUQSiUOv3ZK/TLvyUR+GX6j+ql6rifF+RPGYDGJRaw7AvQ7aOgOzdO8wbIgq4BmtF1QhnRZ+ru4Oo/8h3xr8lJjZGktCEEKrtjcCgMOyPeKxkQwhr5Xs+4b5H29zR4dHKYT0+NIqPDqdQk/Uds1Jaupn3x9APxsyH57zBWiCnPj7g+rASqDzN5jOmDBvuojRz+VCe3E+8lLB9DkaHna02cjto9ofRzYNveNIg== 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=WfbiWonVGN4SC9snW4sLB9LpR3LL37uoXnZlOkm+0mE=; b=d5fFkJMVtrcpnZcyoWfnfGT8RLoHClOoF9XQ2L7mTVfoWtKQICYoFJZHqL+XVTd9ZMsERTRtlCrTR+Lp0JmXBcTvD0ct6JLEnzv3ThPh8g3D8CIgXxkPlfBZWANYv2sjQS3x6iT93z2RcCf76I0s/i3qUA5P89+vg0fF75BtVrIR0kww7qnR9vBjP2QYy028JEklADlN2anyqL5kJHJCnopyo1lpV6PP9Vq4Vy7qKTqForWuJ6++4fy+0DRDOqIMmIJuNehMYklwaKAvG5C8Sw28gVOp/TtIMF0LGUltK0YG9mfl+UJn5dZQw+Pjb5uVzoltCsp4yxLQi19pI6B8WA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB4884.eurprd03.prod.outlook.com (2603:10a6:208:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Fri, 11 Feb 2022 08:51:12 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Fri, 11 Feb 2022 08:51:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 09:50:58 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220211085101.1588296-1-andreas.rheinhardt@outlook.com> References: <20220211085101.1588296-1-andreas.rheinhardt@outlook.com> X-TMN: [6BDI+h4zrCz0EyMIpjmI8Cxv6ynvXqAY] X-ClientProxiedBy: AM5PR04CA0003.eurprd04.prod.outlook.com (2603:10a6:206:1::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220211085101.1588296-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 136645c9-c830-4c01-5b6e-08d9ed3ba7aa X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUp0/JksszMwSTsxktk2qQRWXOI91t2Nh/J4+qc9Ifp4fYUAzGRt4cM77qA14+mrg7tnvFFI3inRLd3I6yb4C3oSwbUUcAFeomoVAfs53qa9tjtUSq77Y2QJYPuKzclxXAGwcmbSTg37Op74a4hCeriWmv2FYTN96Fdvoec+3qCrLTPZESCh332OHAdx9l9itWA2egFYYYvFALGd/q7nmFvoEXznHu2vEUloIJMJTJsz6/jCGPrRKxK8/93CL+cZapAyVz2hT9/7c/OnpTm1kW7QkUyXPoTb12Ti0TbIygnsmOPvacB/AJBV+o1O0oR4dsJxQSSEotx2/iW32N5ef2h3IbTNPnBaoo/R42HqUXXLE61s+z2YCuPsYSfLMrBpFiFSUkwuKvKzaco3bVSaLswqkfSpljBpRUZIn0csalBJk3jTneLavGryT3V1j0DqbSwJM8N73CJy/ih2QbM1ZS+fjO2NuOnChtFY8qAQ41xtMNYdqWUQg+aEk3/yWCd/oxLXThIP5XqCoWDJY/dnROnD/FRu55tEAp8wrjMFJISUq3U5CpJW/zWt33KlIHF/q7KcBv5bOASi+UXUoqMnS8BNCv9+LAcl71Q1E3P1hUCHhws2JaMde9he4pex7LNs/vQiiaWhEdOvzc11UmB15jtg5e5x76UN9P/hag17KU2EK4gJspCRrCu1daFSzbHCodjzBx6j+8ppNDUcUsUzLbokpI64OVP/Zc= X-MS-TrafficTypeDiagnostic: AM0PR03MB4884:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Npc1oZZlQO7XKziJgjgU9mqbJMSIylVUHGBcJsLywNefPYJbYj6AW/BMvXupjS7CptN17e86ATM50ZEBEIxcVbFqf8Ew0+SKeEZdcUFNGN468GIfBC07BJCY2ei4M5okiem6s/PUNyOVFo7JZLh+FUqMtpUOPXSbzMRVo19BGGRbm9hy2yuIq7hfkghd8IHiZp9HrDYT8YQ/qnHnxNfT/7AntU/qtXooJ9GMdC3ZUqJalh1sxoC7g+gI75eyoUJt54peWVjRezoD7SYprzL/vuikpHtxlfv6wf+ZwTiksIwqoot0eHjQWxQ48pp0VCwaZS2FFApeUx1HgZWVMNljcoIEgWJEW9uivLqDxkLdsqXnIMwrpyFShRhXTh5u/l1lmA6BFIaBadfqny5gR5Q/wO4+3lsmJHKIFKApmRv9iZnIZXAvB90i/j2TaZzwMAMOrM5XhvOF6gszeexpNCcEodI7SaJZ/gNTiXEcX7CDph1ZqvU4lFnjOJm8Mj0xWJnmBRRgOE1Q5UTKjOC1kyzHvuy1O6tXLzGYEY/CqBFGMBCqafVdlpSeV/AB+C2B1lEBNpdg+MJ/TsmbQpHRgFuswg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h4Wwamprp2pWpDcdxkV6RPPgHnsFF0U1ScAwnZFQZVkkvt5HoVk6rx3RA32nPvMSckiKER5iKX0FttPzfWEaSBCCpkJ66JA5PBh7Y0slBOBEYGIYT+AabVnzdClruLTOKsKrFk8FpOgePOJTfkrGhCahe/OgayYPQJw7kDpCZdWNSHzxaRcZ3r0u9t7NxAzaOv9jHe6iGZSg5J2fARxDsBbtJ7fPymAn7KvWQcufD6EgVARDM3eFtjEGyH2qSRWvZTU7qHrPk0KuelehOFWxwtKhNR5MEHVK7dVmNoSbpdug9EdGhN5kgY6+m/UNtkXwHdfsaCZe9tXsnxkmR2MgigB5wZ1Iwy/SPM8aqR81dnqXpW8YcQMDlOOgkrmLP97A2pZbbWhMUygHds6KQGxl6pFNlToToUfDLOY5Wjn8jZ2iAQ96/vHCMya5Q9a3jsaGcTKkbeKRpDxFG/ZkuXBlxHvoRL4ji7FrEW6zcc5nlLOkqEtkdqEFSFfsb4act/mmU+NWVpLIzHrSKgLzMrm+uOROM5ksA4yu0SNI0aczS6AdQmgGrEA9K9QVn7CZLG/6jo7NQggLfHeDbG6xV7UJ2M3QrZ8TEQQX6bxE8eU+FvmF3qmjywPhfeNpZWG+BTOaoAjOJMXIgL459kuaBdOVqhKM1JeUQ9uBe4U67nFxxEt4hVoAfA9qYme/18inOW7DdLxGKRsp5z2Pu1k+RQSjzOfO1qD1SeImAlfsHm720yhjVbg2RqVrClbcnu3pmdHIvWVXU7xUs6rdgnPmLS4nWJ9euYkVr3VyIMttSmDHYDlsQddJh+pR8uaFFvDg0JPODgCk0Geq4uPmRLuVhjxDnAohMT1nLRiUcIWvlWdCwbJthqbWqtZ339NDkULZXjWj7GWc4v3n7FAh+XWyWfXsfAc/vYaZDc+S+63Xfsf1fZglmYidZBIsmY8Fetz+IrifzlAeCy7gTUHik5425gCNbg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 136645c9-c830-4c01-5b6e-08d9ed3ba7aa X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 08:51:12.3948 (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: AM0PR03MB4884 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/vp6: Avoid allocation for alpha_context 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: yEq9FnI3aF4i Signed-off-by: Andreas Rheinhardt --- libavcodec/vp6.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 6bcbbce47b..3acca16f3c 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -652,10 +652,8 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx) vp6_decode_init_context(s); if (s->has_alpha) { - s->alpha_context = av_mallocz(sizeof(VP56Context)); - if (!s->alpha_context) { - return AVERROR(ENOMEM); - } + /* Can only happen for ff_vp6a_decoder */ + s->alpha_context = &s[1]; ret = ff_vp56_init_context(avctx, s->alpha_context, s->flip == -1, s->has_alpha); if (ret < 0) @@ -691,7 +689,7 @@ static av_cold int vp6_decode_free(AVCodecContext *avctx) if (s->alpha_context) { ff_vp56_free_context(s->alpha_context); vp6_decode_free_context(s->alpha_context); - av_freep(&s->alpha_context); + s->alpha_context = NULL; } return 0; @@ -743,7 +741,7 @@ const AVCodec ff_vp6a_decoder = { .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP6A, - .priv_data_size = sizeof(VP56Context), + .priv_data_size = 2 /* Main context + alpha context */ * sizeof(VP56Context), .init = vp6_decode_init, .close = vp6_decode_free, .decode = ff_vp56_decode_frame,