From patchwork Fri Feb 11 08:47:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34220 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3023538nkb; Fri, 11 Feb 2022 00:48:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUZbC7m3ix07zc/V2BT32bK1TsAASnfbw9Ne1xy+D6e2HBeBeGPmOl/3McZ8oF5QZQFRzG X-Received: by 2002:a17:906:7948:: with SMTP id l8mr499932ejo.752.1644569290058; Fri, 11 Feb 2022 00:48:10 -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 i21si5282852edc.391.2022.02.11.00.48.09; Fri, 11 Feb 2022 00:48:10 -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=DgrAaGmr; 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 5AB4168B1D3; Fri, 11 Feb 2022 10:48:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 097CC68B17E for ; Fri, 11 Feb 2022 10:47:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DSVEiflPmmeUyDu8URvOuraAomtu2Qv4Vc2a6KRICA+5uBTaJJl+rPnyjakmhVZDQr4V2PNfDYDxkGoAf3thOf++oPVzOW98qW9C/0hhiRIteVtlz0t1d+zyzF+zZvZ1LZRR/AWsk0+Tmt8yJQq1gJ5cJ/asU3h7U3oRmFx5LvOQYm1E73A+D55/Wzm8FU9ikjyaH452pdrzcqtYihq7keVbQKR9tZPlFk/OPlGy4i6juSa3qemVoKTvWR4XIN1m80wdfXVY+cz1NhQybgKZXaxwSM/gW+YQ4noksx6r2vesBwcHKxLBFJcJ+kEEyzAe+wf07hX8lhWvyAqWiSYKWA== 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=MpV/YXEoBzG44rML8nEa9nKB3fCPZww7zxVx8TYZcy8=; b=aVoPvmKuT4IgJEXUOuqc8LpTkOkJR8OH1J8PK+aEHpEgp2lXNTFnHwGtsQgCUhf9UVAQm17MZqFO0OwTGpaX29VLF9OgTM3tu7horruGqYdTiBivk10jLE/5KCXdiIr2Qm2NX8Wkyc2Vwt/54i9gyYJaql3LzFgmb26eGf8ixt2AKlqlNbiC74r7alr39cQWlblmabbOCCts5/9gtEZs7jASChY5g4p7jUAMyiP8TAi+7yAAeZZ5E7RW1Cfv+EjOpP1X5SC/+HQaNiYcKCsXXqY7AvSBgQ+Qn1ovPKVAI9RWvPZtnVpX8kJ1ii+XBODmL/izNGMtbKpNdMGyBYkF4w== 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=MpV/YXEoBzG44rML8nEa9nKB3fCPZww7zxVx8TYZcy8=; b=DgrAaGmraJlqicxXjswi4lIB/i5RIupOC9sJuSFJU6qBsZ4VliHjCREvuEob72S3XNZquGk/ImXTfwha/svxkwirCN80V+J4atdEFFjhl9fX5RndEyeMrzBz8PfOcalKBVlMnYz8pQEZQvEpgX3h1UO4bGDGTq9oD0uoNLN/OnxZ0UQCAqgN8R+zcdmZpanUwegw8+y0NqzHYxwdEW4nxte4HZ6QNlFgUO+Ws+ZQgaWN8JU+1FaVE7TOGaDnjf68HpWtzkYy68J5GbBFDKyqhj+X85YqvEqpY6Wvxob1sV2KsPgt2lxwjZ02AEh1+33LpOOu4gKRTdFaYvcENahcUQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4602.eurprd03.prod.outlook.com (2603:10a6:10:1b::14) 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:47:56 +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:47:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 09:47:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [cvWjidYtZuJtmr/MoypO4xHQf65Coy5C] X-ClientProxiedBy: AM7PR02CA0022.eurprd02.prod.outlook.com (2603:10a6:20b:100::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220211084748.1587967-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3747c498-e751-4d7a-ba2c-08d9ed3b3220 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSJybpSSbCo5zX4av1Jyrl1EGreMjwOfA8MQYPdrMK8h7er4LAkar5d9khrzoCq6d2y37e68nBApFOEEugqjNrmmHt0hgOWeArOgojcBDON5ccFAkRm8df4C4tzk298I8if5C9smtEeb7d9qNNwvtcRGXmgxsuIhYeFy+3opEFIHSOUnP3TZVY38IYS5JzkSImXwB4/A3rZcB3smTxAI9d1qYQG6hDXL6QD0pzlfxVCHQgRiv9UluCblh+nLIQTKuqYP5iVXiUU3ZJ/kb0q41/bVzP7ue1hj/N2t0++L/RieXR+C5gqucxdxBSrZ8t5ZgVWrwsczTQ/wmWNxmCI0HSvwUOP1gRDKQgMcuZCnde+cU0cIGvFRhxJxO408JW2dMb9RLI+xjBIexpCnXP7mkx/E5i3jnSrLWaWFV8Xg3m12yUPGlhkGHrQ3P7DBt3j61UR9jCuz4kkpzqo9Z/QBn2D+sPhwLrADrgR6dPsV6iGwRN0DLSlRheMCulQEQs0dYRFAwIoM4wncLq8HjvJDuCYrgsgLxN1FAwlrjWV8jYl2Qu6AtUakBr9Y7mLFEKrGr1tY+lXkW0cd1Ekiu0UGawEglfLIKNZtnldIxPCceeKlvDKP5QZFiHZfSllPeZCmofftjr8ji8+Z0CnhbLMAQjO41mRQTsgQ1sG6hhmBfmd+KKthvvJqLG9ryfEA5OsWQNSxxDDpDDyBTgirVYb9q8r3EccHM1ZxHvz4tAmYTbJWsysSsDHrsza0w60qI+K+QE= X-MS-TrafficTypeDiagnostic: DB7PR03MB4602:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M1cquWc7Pi6EnnoJR6XFsyBX0t0MkJh1rVx+mePxFPYnvg187i0lumPGxVk8oMi71e7Jb+BYM2HS1iegHs158bzG6jMB4prgVPSG2xpALDGTP7QE/JLaTipGuvwpewYhMXUiPg3uDFymFCkV/trACM0dTF70mS5B0B/CacEZTvzGP93SEziMloL/rBKS8XBj0IpTON/PKZOcVYpci1kzJ2gjR3JX4AooHDSUT1uqKx92mKiQ/Vn6xgw/DHygUvmI4Uj0mSX6SUG90Zr971L3C6HUvxClocmDWdd3lL5ftnaEGJpm2VcbbqALef9HMZ6w2N4PDd5QVP+jWf1sVlg9Yc06S8PnFeGRWstolKWnl7Hs/QHAPdIkY3g5j/GLVjGRaoFS+YyqCBj8Gn6FVOqADABYWAoRYX7PZSCpN7wuz141EAMVukm9pLDeJ1jmgDJsnAqtkCh3f4qUJsAs1m4OFoSAT9mIm/7FzKOxF8qVcXZBeQbCDKbQCPqvmGGhxu8LLCXpFXKWipJFf0p1y8+B3WXxGD8RmPwKVlWUAX8Kpv5ejGUHLQGtIHRHw0k0SueSyO1Pt0hPIpEM9gzyNHgGiQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tUYImkQ8J+e1ly22Fbd0GVMShQK1kDpbylQnxLcaLHZ/apQeMDx+qiWijAPuy71gO491WZ0+XPgnCSoedti2HuxStMX6Bzw+ak2xkvyP8unF01vuVsQYdrFQ285OHMTr0RvNO6fepe+VbY7yUMOStKRMBdR7MdpsiWnn1gRNeN8v/qIE4UvamatwGh0akSMI1vdRfIfe2FtUHL3ds7cf3/yUraMXJWsnl6iNCYFbLVE86FiVlFLgkL+DeYYjb144K0c3jmb3W6T0c3nRnJ8EGwootN9jjGR+vzMCdfi0aQEeiVHMu6DVKBOvpEAfSFNeox7DBzgk4irh8oRTaEqDMM5XGgQQEouErAuaSzGUjEqnIc+nceHv/Z0AGG+xl4ppYtojR5iNUBqE7iMyQEs1RrmHN80Z5NovgxqZusAJrZAalEMhZ1D1Sm4nEaOLDoR7WOjnKSNmFqYNEC21PlwFfdkDB9zvx2ceYHiA/mSihfFEwlT+XpTbBexMIBLmgPnUxPRo2aJE5fS4Hs3ec1NbItLcR0LzPu31YoVMv5DryQ10Wr24GLqWGeO3eJ6fYJRKcQZA7rynFzYCot/2uWz0pGSJHp6bwKZrHEIxIv78jahI+YGOWTaJxOd1LQrOpmu3Q1j4+9syBGYKEM4QIdfUkNUB79VK1ytbIUMp2SbBFlDiLyb2b9jrJBBBmu8mwnbfhArjVClkfkEh/YfX0OiaW2uoRsd7EODGjve+RgfBw2qlboD+WPKlx1Fbnq7bHJ1SpeG28E9YIWYHcLGJkr/6JNgxJ0Bz4WwJ684ceiOO9o5M2FGJaW6SvRSXFZRpsG1taYShmw8cKyypt9jSDqMbPjUX021yaNiy71PXFKHy1ID8Ta4oH9JyX92huJqnbqpmu9s/fUml0uaCe25k1SDPHfAbx4V9/J4NFja03klpJgNdciRLxKOT0WPPLZtqif0Ij32gi3U7tbk9GQyGJsnC7Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3747c498-e751-4d7a-ba2c-08d9ed3b3220 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:47:55.9805 (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: DB7PR03MB4602 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/vp6: Check initializing VP6A 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: Rxz2oDS0Oo7s Signed-off-by: Andreas Rheinhardt --- libavcodec/vp6.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index d75e717082..95ed5eba0f 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -654,11 +654,12 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx) if (s->has_alpha) { s->alpha_context = av_mallocz(sizeof(VP56Context)); if (!s->alpha_context) { - ff_vp56_free(avctx); return AVERROR(ENOMEM); } - ff_vp56_init_context(avctx, s->alpha_context, - s->flip == -1, s->has_alpha); + ret = ff_vp56_init_context(avctx, s->alpha_context, + s->flip == -1, s->has_alpha); + if (ret < 0) + return ret; ff_vp6dsp_init(&s->alpha_context->vp56dsp); vp6_decode_init_context(s->alpha_context); } @@ -745,4 +746,5 @@ const AVCodec ff_vp6a_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Fri Feb 11 08:50:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3025247nkb; Fri, 11 Feb 2022 00:51:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+0cqPb5xTm5wGHd4wZInpFqEwDb5YqCQZeJHSetk0szo3sP/gMHYysddxIxYuWauyMhQX X-Received: by 2002:a17:906:2081:: with SMTP id 1mr491320ejq.588.1644569483266; Fri, 11 Feb 2022 00:51:23 -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 e18si18056353edz.40.2022.02.11.00.51.22; Fri, 11 Feb 2022 00:51:23 -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=qSjMWh0f; 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 E233168ADE6; Fri, 11 Feb 2022 10:51:19 +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 A381868ADE6 for ; Fri, 11 Feb 2022 10:51:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WU6wdVEjr4QPm6J4FT/8oEsxAzUc80dZ/FRbCoAFFoEMoXmmdHeYDfZ8r8R+Q9NKFex9VU80SMp2JZlpGDLY4kTz+BACelFTV6F/0Kfhv4/isZ6bzewyDkzFLp+SPWQ10y5OTXAOZIZakVHNfrHzvSnDdmFlfhRFtrlSGCxLEVBV1Z1ZDT5Hrkx9WKS+Hl5v7T8nQWq5t0A/rtCUnozwaxDfGlMoZkk9xylkxevuZyezbVcHQeXiasgSNTgHftCOR6GDa9xvANvm6z1F2zMSEt8f6eq6D1BvtJwzqYPGZWTc/fKmhU7r76dMUULbTlKaPdeaE58/AbKpFDArRGBn7Q== 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=1Ru5qLa+cOMOTgGXIX7sVcIsytZCTMiL4+eMsHF8usc=; b=dPhXCTWc+U0pL9+yTfLLgMNZOswGfY6lKYWZkWSuo4QzNlm0xb5EfiEWz9hRmWKB+MX22FLYpwGvZV+BLu1LxPTeCBOjEg6aIzuYUkGfsE9bmTbc8m44iHLjruIvgGiH7rVL3A1rjcXBYyi0jc59Ux4dtr5PYfqJTDHhGjRJyWEVCd37OBZh6tXHnla3D2fPSvwafKxqZEAogeX5Q4p4IxPsHgYewsMkdb0wYKsGVi7eq7ljD/UTULPizm/MRhBCxBSQOJefdSp+58HnoG/T1Xzxw/3+u1fQ6JpK0pih+5pcz9Dym/JLKaTuMi9FOL+lNVY8VdiSO3dIWRJSdZQauA== 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=1Ru5qLa+cOMOTgGXIX7sVcIsytZCTMiL4+eMsHF8usc=; b=qSjMWh0frXVMHw0Sh/jxiyhcKiMtPmqTXmGd+JXwmrdo6iAMXdDGRZDMfQtheJyGOhc5Jg9TjyYk+zja3Z75TcvO+MTWcT1zMvRriackCHGEkHMWF5zY6hyQDCavdH8lIWScsHfLDJbV/+G2DstyFfztYOquamktD7X4wuwIsd4hC9KJMghICpsm4VrylLujGAfN3wWECbLcL8aDMNeNWbeelXEVH2T+yW9X0EMCshgIXZzA8ovz1ckasdNfB3RcmZjjH+zDQNcXbqduyeVqUy4tMx3FqjY9htRmubxEc/pAnGD9g2m4nq4FLL84XCB4uG2USaBX3eMFESpcdCdYVQ== 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:10 +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:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 09:50:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [3udQYzp1dK2EYU3igjsnCyahugKmYq6M] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6b6cb25-579a-4f5e-54b3-08d9ed3ba668 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSJybpSSbCo5zX4av1Jyrl1daDunnxRv6n60BQHxXvogwlw68tr07uA83eaXPw1VAZy0hVK+gMbZRRXN4H4jwAdsHivwcZCxSTWT1zKxm/1DDL3T865tTPU+H19ayJ85afRq8kQSjbIsDCf6PgP3VwO2k0l4UwZjswGQRPk/E9SQQCmYsMZtkfTffCn0YKZTkbBeLtC9dEXhNgx/wNGyjVZ5Td7ebJL01a7IUya5/uNpCzsFYHzGAMTCuIWfL5V7zSoDZJbZO3kVgHFNESLl68pEeYKQEtFkqcNChPq0NkJPEfcq0KCP3D3a8kmIM/Xgd+1g8EzdeOtJGHTxFNTg/iSxA/DLAGfRsfYQSp271yO+7Lt8N1SL9wXaDm0dYz7Qq2If6ADEhUhOQ87zBwW1yVWHFdEA3qxvDYtoCoR3XMYgemAZMAjMeq5dZKywS14yoxBu3QUiiVBIURNGBHvTJxUJpbekgU1nAkPKK8cboKpZezE77xxmnl791cRDzyoXjIKB/mvgFESG5XkKXB2nTMzSRsY3AemJj1As2pJbYOOg1RGq5nSZGD5DZNV5JO480JYYQFcK+YwauYg6icbM+vIa6ndZm90bdn58uen9PTaamcZjZz+n6WX6R7XW0LICf5EgaboQaY3aZ7clyewGUN1vN/NAE5QqCQ7wow5afdVz3omW6drhxHqz4jgX8sr+cv3GhIUMqAROeGx5YgVjpPkDy9FNOrzSKVovSIsVBpD+hXbI+iq8ZXPdwWC9IHm/YA= X-MS-TrafficTypeDiagnostic: AM0PR03MB4884:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rNhyB6tGYCOXajYjGHZidajtc5cQMu2INvhu3RM8sbThHCqPyviaNttqFiY91/DFf4iqD7f1/4gKbeKSzl285sK/138FoADxQvdSFxk+F6AY7ktCCCD/F9Zxg1oM8JnwoACxyEUR5MPvU2VBEKY+wY2Z+HEeylNBNRKA+iXFd/VdA6RKea6sfZU49dOGDXy3ybO4hiUMNt+8gR0BDVO1MqGwyhplR1pZikdR0xrIi9BKCSNgiokqouzOtM8oef18FjtBaqaryd8I1SKr8D6o4vRsY71qlv/SPMqYExuW5VMh7SW/bGjuEQ3/ZNUVkXFXXnW3p1gqQybhSEk3MMYMQ8Tvx2X1Kak0MTGW7krRnXQ7UlYhKBCXB79hzE5xIugWtQBJdlrXZPC7Vg6nXOasHXAdtlCsAcBl6XNFTPZxj+sVlLUUuagjyxmhm+gFptLrh9lTM/RUonkxr1Htm0QJeUyQ7Vs35u93kKA/uvYrBJYOizT4foKXvrcsSANr1+p0oY2zqUgnVDLEncbiAR1VcHnxzAsUOKYb5Hn8VWtogd6bJm0sSEVCZfdyceyStf4IAACb2SWe7s/6XLBfSyi0NA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: thApsiQPiSQGN2QkmWm2wLOFIFluWQIpy2MZqXB7E7cAzVtoy0wFN/fU2SqEF3HYzeHwVJwSU7TmI7UfSzpaHBJ1o7wyQTvwXiWDlBuVIcypbQg4rk93CtyUHEmbaePq7449TfYqr/3IfUFXE8fbdZEwi9NX/LnBmjqD5U9aIj3E370k6yCdirSwrTR4mXDvLPVvlCYIaONlxAoRyZ+98+4Zq6VyfCRImGuP2cXvF3yJz5xY7psMxXno72BjdZ6orCzwceuxbIGOpuMQ/A7D2YsbOQSD3KWJesspWRPx4dKytINPd/IqcP8f+YBjKCjeuLer+eFBdTirA/XO42bR3opS66zF5+pKAGvgEGKm6HYkiq/PAZf/q8qyyE5Oxx+lvKxsu76YGKQGSCe/9SeSCKoq6uBy6UE3W9MldfCNgXqRtwgKHujpRXeP3H1WuETscuvdLY8UlW5S1J/h+NyGr5uWhQmGRiIhByaIgz/bweSxOeRdn8vOpQlzjsu3APsDLAjS4T0LswkTTIPcsISn/QRdxxKjSS88do+/B53fTWM2csX3rLhRwNr9v3snB5OzCyoI8oEXmZSsjXIJ6ud+mYmMdRAG5b0aFvG5G6jgDKuq9ng8SPg2G8ZXmqcyMuzK0B038PzYqAEAWwGksz2EsgMqO7HzDN4B2detOZiqfdXluvxLgWaxG/k0N/kAxgCLb+AUB8tyUlqlhSX90HP44P8byKv2q1apRCSKd8N6jUBhFbc3RfamTSBuazIWdkwGKbctEdIM35rxkKoqOVXrvf4omanJR3nTZJhtFlZveOe5vHAFYj8reddGXZ3lR9D8Ju0FMf1vCjf3/i7Zejcmmf3zCzG8cwOUx1DLJy8p2mydm8OJqF99aToR3qt0BmfZKWedckHW2NxS7IcRZ8VhvjOkLmUCZtg/BSxfk46jPGcmpKCFZg0ABh6tTPbiDyCT54D10ZC7JCPTd1SbBTNurg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6b6cb25-579a-4f5e-54b3-08d9ed3ba668 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:10.3312 (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 2/6] avcodec/vp56: Cleanup generically in case of init failure 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: 9ekpOvdRe/gf Signed-off-by: Andreas Rheinhardt --- libavcodec/vp5.c | 1 + libavcodec/vp56.c | 4 +--- libavcodec/vp56.h | 4 ++++ libavcodec/vp6.c | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index f68c62527b..a3c3da7ba6 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -306,4 +306,5 @@ const AVCodec ff_vp5_decoder = { .close = ff_vp56_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 695f37e972..d4184f59b4 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -800,10 +800,8 @@ av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) { s->frames[i] = av_frame_alloc(); - if (!s->frames[i]) { - ff_vp56_free(avctx); + if (!s->frames[i]) return AVERROR(ENOMEM); - } } s->edge_emu_buffer_alloc = NULL; diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index 46090f25c9..0a9eebc7ea 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -217,6 +217,10 @@ struct vp56_context { int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha); +/** + * Initializes an VP56Context. Expects its caller to clean up + * in case of error. + */ int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, int flip, int has_alpha); int ff_vp56_free(AVCodecContext *avctx); diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 95ed5eba0f..6bcbbce47b 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -720,6 +720,7 @@ const AVCodec ff_vp6_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; /* flash version, not flipped upside-down */ @@ -733,6 +734,7 @@ const AVCodec ff_vp6f_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; /* flash version, not flipped upside-down, with alpha channel */ 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, From patchwork Fri Feb 11 08:50:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34223 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3025390nkb; Fri, 11 Feb 2022 00:51:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLjTlNzW6eGVgHXwCE5lnfQZKHmSFpGxqziAC3r/TwKzA6mvQV0igrjhxvLuz0Vurzbs7b X-Received: by 2002:a05:6402:50c8:: with SMTP id h8mr771395edb.144.1644569501255; Fri, 11 Feb 2022 00:51:41 -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 q20si10293039edi.320.2022.02.11.00.51.41; Fri, 11 Feb 2022 00:51:41 -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=AxG25R+e; 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 31CA568B21A; Fri, 11 Feb 2022 10:51:30 +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 DAFD068B1E0 for ; Fri, 11 Feb 2022 10:51:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ck1/SrZ+7kOLHju1Ig7FMZz+3RahCrdOktLHaNGq489Fig6QuqAFxiNBA5sy0hL65atZaKycWXgmp+IMQRxhO8LXLf2ImxXILYOCsGKN1w2pxfy1k6lpAjb4vnVY8DFKPLLCqOkSXMC690Y/wW/hG6I4mATyRIYqx4YkrCUjX6e1LLwM2TXny5t8k5W1PcvafdSzZGPLMWcjqTD6oIl59f9M+cYdqLRaSbr8a2Q+ywqrNCr8rODFzAUfYeVUFdyLBcleztILtyM2pz0RKa82tCBRwyrVvgPlgFGm05087bGQaTrY+AnLjGzEDOgGbfI/ZEJZyYBWAXDJaS+WT8/fkA== 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=6En9Q0RASXbZFHrjKpcn+WgJm9obKHIaoE7xBKNOaCQ=; b=BZHx7/lwnv526nOcyaYiHk39wpPHuzTbeo1qPACPncHv3jDE4DxmZo3DwtacFlKpc9OE2RIpe3M2E1oErFe47EC6Ud0om2rC2ck9c/bWMpogk6xERVfia2j/jqFdgLoakF5GMDIpW4/F5Szll8dKYYsc5gYXQt9KHl9k45A9yvfzRsKHCAPhJ2sz3uBemFizUZzt3W54dtCJ8Ul0KMeTIA+Hy4RljBZa8mpWAXiPamf0wy9M4Aj70SPtbPjQXgZqAzjgw0Ir4qdDhZpNwebnKdBIMiJ5820PiuWNADjxDJLXKEpppKTffJmdZi9OqxC/qxKW0s5kKnUGeCWf0z3B1w== 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=6En9Q0RASXbZFHrjKpcn+WgJm9obKHIaoE7xBKNOaCQ=; b=AxG25R+e+gzNHxOA4JZ0+mo1Uv5Lq41IZlgzy68CfvZ63tefwn5ANED4U69m+V3CQ86QRr6LdWVnnBTcNs+k+CNAoaMTyxFW8w+ek0lH6P64DnmCQk2UxkxBAb16dNoWZWNuEeOq8jYQB+HFUW91g2L+ZYjIyEBbwhCEF4kdrI3fDb94WFkketcoIr6OC0TjA/+zXaNxEgUjqAHcTfYo50KylHi1RTA6RTHQJzQNyeUxA7ZCHEoMcVpuix+T/bIq6qZlgSYv1g7yCoTg11MyyA2Ue1o/bd/Y/0fod/BmlnBtcsw5mfI4Kqx6nU+NDm7/M07Ns7hD0JwoW1z7TQIAqQ== 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:13 +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:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 09:50:59 +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: [VCGAHencs3IQFPGVCdm/4Bp5Cg0hXotx] 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-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3dc73a7-bbd4-4823-3450-08d9ed3ba88d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSJybpSSbCo5zX4av1Jyrl15ewi5Frp7UR5GnVqRyHG4WsXN4S98FcphW38NeoNjUkJMm+c+Cci8lGJ8/BvplOR0pbUqkpD+pFikPcR0iGopD5k3pK7HuHmvTCDbnYVJRR4vBOCZaIhaB2NheYiPm8tXUlzmg38BLnz7g0MPZhnsVpZAMZkQoOfjHHRZJh1eXnrXGEUNDgr1Dn2Sq0Jtu4TIceF1z0VOcJEdAG9rYt/StiF5buw/29LvzvYIdu+tZrzgpj1qzS8ehag/nqrRDu90nTIPIt1eRKxZUSC2vZfm3HNrLAjkCWdqLDB8nQwuYc5WUfMhT/x5/BvPIE6NYNXRRZREz0i3GvoZAqE0aUHh+OsmXA9e6by0rWkeFT+0aTd0PZ3a0KMZuv/z+xaqVBvtC0+k5OynrSm3gOscCPAeODBZx/DBcmsPlYpolQieGL/+ZReGuzqoqMoLE9z+1km5DngB0zezYSlYdRMUTnpwUpGnipth9N03PC/+g7t5mcSF4ZtJ0sjXbCHyTVS2ybfQZ3kwPz8qiJ6pQRx2SyZ3xtDZmsbCOO9QJtHw5Br6XV0+nZqi4pe0SB5Oc38etx8ETHJU8wQm1/tkW7HySlRlz6YfOp4ilrzR9tD3pTljFcFsnVU7N1KZUyFc3hH2DZN8mhwfsuqZoXwc0w5kJV1YLiaQPmoaSb0sGNag7B8mrmiuxNLjRfoMAOZMufFjhNJVgm+Bw8zfnbDvNKJka56ZVyj2Ugo4WNU0aqWgKwF8qw= X-MS-TrafficTypeDiagnostic: AM0PR03MB4884:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aqj9Q0heHORhq654V1epuaMrlffJPkuQei80cFfHEMObfi3S3QGaCr9QzF8KTgrrKR6gQ1QuqJ2sef55CW+PHyJJyvO17B69U/YA9kddT6hu5LmmavzeMrfRLThzc7PuHS8Ul+5Ez9EEjS+JoKMiKxhcaQqnft7LneKdP6d6V8C8THDUAAhbB/X3hT1qW/7KGPPHRXYaL5pyxZ2ZjSyWTGcyYQV+muS6uMKrR8YYMs30M4Y4oOKwTLjKWPQcm5bTvI5tCYY//xFvRqVceV1QadmIpqOAKYkB8pXmy68/U7jwkPEGezXypgoVNh4cBuSQGn2UV7q6hv7zVBpdG4n0hGaGCb7uQbkXXzoO/O0WkwrkwxDErs4/rLF+SOTYgmnIxOFFS7CUyec/LteD8wzRTDpiABdyLl8iiVSHQLm/71xqWbElPHanR3bhDFL9C5YqYM+q6jvzboIKDDDBwpGBtIhySvz/5bw+W6isO9hO+EbaTEcumio/wD2JHwmPnoENdQnl2J0HwxFEaxeP5Dm4Fqhfc5sHJyKYi29pL2GsMxFH3DIPH5WYuaUFVKpvLrESzlPQJ5xlQTa+ZxbXm5GGng== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xneTsMWMGJpLoOWO9HIuMcoeACe9DdVPWbRwsXoYysGRs7TTGrkrFKcnsN7jxw9sMLc7YzexpbJCoRTStamcSNe+P5AlB3zvZGjyGHEmuWx+GAAwvf+xr4XH4FmID38cj1C7SE3bUjywlWWEwZHz8xg9iQDXR1Dp+Jp5E/DT+KhF+P/ZdOGimu8KJYUyGczr3Pu+kkhLFVozOSLytsTA3JosIDZw+Grv6Blr8GVLryhYDnI+dKaReD6SDsEDQuYCWe28PDuhEd0eLyzpw6IpS6V7CgIP5LPE4NAed0Xzip2JH90Uev+KuQKeDmJ2oEc7F1Uh+560K/645jVe+Owp9TSKFyTwaOszhKgWCr3a/B33vVVGWwSZ9IqB2CEVAlnuRrNlY3dCNh2aV1iOxUu7HALSehXaO+IO41D9OguEIxP4bCfyuTnkBiKJTCw15N5BoWk+6y01b5n5zdqF3eTGkCgU0QTW8vTqy9C/v7SazdSgpIwrMhc3s7UU1H7QHFe9IWTU1Rks16ugRKfXl8vkkDS4qKgGbK+gqSJCnYfqo9BxH6tzGiXiRABRJ29MB010rjG8dFVWXDrLSV60TcbX9JIr9L1kvjDPbFILjFrbtsoVDMZShBylOkbPGAWYN/9teh9EI7rXwIkmjrC55nDLQm7g3LqJITAakjSOepzK/EpMqv7rwxRx9SNPhObAEUulcMdD7PxyEFyDCGBKjJyzDdMmLKV4q9qLgV85Ahy4UPa0iJtrAaP554XpzX8GZzhsjnNhTRjyWKriZCyXPJx3E6wrbgavnf/FTbqP5m78dW1IJauomcIvsjr94rlceMkHRCuhLTLS9tGa95eQ1q2oz43SU0Y087ZVkEMMx1SleEWJUCSrNzwE8z/wutzgf8uXxIVq7xDEyV5iLQatCzkCwVovBW3XSvvxCoD2ZM6bqFGyQyhWObpfZtsjj2S8SzEizXde/m0DmHeobPiYeeGBOg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3dc73a7-bbd4-4823-3450-08d9ed3ba88d 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:13.8971 (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 4/6] avcodec/vp6: Avoid code duplication when initializing VP56 contexts 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: RBI3j3qDREKZ Signed-off-by: Andreas Rheinhardt --- libavcodec/vp6.c | 51 +++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 3acca16f3c..ae8e223349 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -637,57 +637,58 @@ static void vp6_filter(VP56Context *s, uint8_t *dst, uint8_t *src, } } -static av_cold void vp6_decode_init_context(VP56Context *s); +static av_cold int vp6_decode_init_context(AVCodecContext *avctx, + VP56Context *s, int flip, int has_alpha) +{ + int ret = ff_vp56_init_context(avctx, s, flip, has_alpha); + if (ret < 0) + return ret; + + ff_vp6dsp_init(&s->vp56dsp); + + s->deblock_filtering = 0; + s->vp56_coord_div = vp6_coord_div; + s->parse_vector_adjustment = vp6_parse_vector_adjustment; + s->filter = vp6_filter; + s->default_models_init = vp6_default_models_init; + s->parse_vector_models = vp6_parse_vector_models; + s->parse_coeff_models = vp6_parse_coeff_models; + s->parse_header = vp6_parse_header; + + return 0; +} static av_cold int vp6_decode_init(AVCodecContext *avctx) { VP56Context *s = avctx->priv_data; int ret; - if ((ret = ff_vp56_init(avctx, avctx->codec->id == AV_CODEC_ID_VP6, - avctx->codec->id == AV_CODEC_ID_VP6A)) < 0) + ret = vp6_decode_init_context(avctx, s, avctx->codec_id == AV_CODEC_ID_VP6, + avctx->codec_id == AV_CODEC_ID_VP6A); + if (ret < 0) return ret; - ff_vp6dsp_init(&s->vp56dsp); - - vp6_decode_init_context(s); if (s->has_alpha) { /* 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); + ret = vp6_decode_init_context(avctx, s->alpha_context, + s->flip == -1, s->has_alpha); if (ret < 0) return ret; - ff_vp6dsp_init(&s->alpha_context->vp56dsp); - vp6_decode_init_context(s->alpha_context); } return 0; } -static av_cold void vp6_decode_init_context(VP56Context *s) -{ - s->deblock_filtering = 0; - s->vp56_coord_div = vp6_coord_div; - s->parse_vector_adjustment = vp6_parse_vector_adjustment; - s->filter = vp6_filter; - s->default_models_init = vp6_default_models_init; - s->parse_vector_models = vp6_parse_vector_models; - s->parse_coeff_models = vp6_parse_coeff_models; - s->parse_header = vp6_parse_header; -} - static av_cold void vp6_decode_free_context(VP56Context *s); static av_cold int vp6_decode_free(AVCodecContext *avctx) { VP56Context *s = avctx->priv_data; - ff_vp56_free(avctx); vp6_decode_free_context(s); if (s->alpha_context) { - ff_vp56_free_context(s->alpha_context); vp6_decode_free_context(s->alpha_context); s->alpha_context = NULL; } @@ -699,6 +700,8 @@ static av_cold void vp6_decode_free_context(VP56Context *s) { int pt, ct, cg; + ff_vp56_free_context(s); + for (pt=0; pt<2; pt++) { ff_free_vlc(&s->dccv_vlc[pt]); ff_free_vlc(&s->runv_vlc[pt]); From patchwork Fri Feb 11 08:51:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34224 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3025480nkb; Fri, 11 Feb 2022 00:51:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCLfWB9dARQS41vdiw+9Fku/TITs2Sl6H2gQEkXTwRfQTVQSpcrAxcbmn0fgCHeFPNcbmt X-Received: by 2002:a17:907:60cb:: with SMTP id hv11mr504280ejc.122.1644569510980; Fri, 11 Feb 2022 00:51:50 -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 gn10si8212229ejc.539.2022.02.11.00.51.50; Fri, 11 Feb 2022 00:51:50 -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=QW+QvTBx; 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 5398068B24D; Fri, 11 Feb 2022 10:51:35 +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 0179A68B1E0 for ; Fri, 11 Feb 2022 10:51:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mrhedcIBRZwhdXZlJLEz9u1X+X/NmI+16HbLhCpCTpOR6xuTu94HpoB4F1Vu7SnksncYW8EZNOsO5xTfPjQBR/8MAju/1n8Mk67A95+T60s5o5U16eFecZIOu4shqJVEIgYygKKnSF/ISnwjKVRIgXvtLqPZQrRy/uYXZUzTxoRlrMfh+3kzGE/NwbjkJgTWsOGDlJAhxCtXiMeuX+UZgkdkT/FvnkrJXWXSp7t2kbEltGCLAAmEfXi180Df4Knb+iUn2CGvwzsaoR9CpsfSPXvYckcMpiFTNfl1iw0Pddhcz88xNum2l8rHHXGXZPm2qKEuo+6YoNqMItdywl8KYQ== 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=74Q11YaM8U5laqox5L+ru54FRzLIRzqRSQRrQy7800o=; b=PHj7PqCH4iKfBsd48UJBT/96fPPpIWrtCu0BJnjnKGg741fApdGyV2r1GfYFn8fhWT/dya6fv4sV48824pzogdbrF5XJR9EDLVi8mbEh24Jk35ejcktw+XBJjfOGWsPKKp1dMzKqCQaForaXePl6Y6CMB6AZbZJIuKwGWVHvGk/9HsbLKD9zmMBifekbd1ym49wnoFN1UlLTCzLcQx9pZ2vSEMfxO/wrfx4lRQoBLCqln55Tk84sYHf1kSObUbJtPOGr9ZnmeY/Ovf2bq4yzv+KO9Df7Evu9493FFpYSKKx8++brtoxJj/n1CQbn2aIjfYAMnkahppVxk1go2sGggw== 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=74Q11YaM8U5laqox5L+ru54FRzLIRzqRSQRrQy7800o=; b=QW+QvTBxjbMPDZK0seqB+aovNCcI2EcQnGzOLvR9zrtaLRflUePujGxKdF9n5JmIS2xLh+RcLq7UbCkmyOTTcqJzwQcJfOynh26gFSW9jxcgP/Mjg+tK6Be+k+dxSd8zV93E46GSCdGIZMHTW7vNsuCQKwX0XM6HgAcXyPiTAQFkLAd7Uee0f3dZSIht2P+P/+rF+xH0g3IraBqf6sEI+5g5tJ27FNtQEpRwJibPQpUKBXtwqpuBP6X27yZMqBtKI9oqaZKoeMAvtt+WrnYZyChlvtBM/3XSpl4ImLn9Pb4FddJ7VLfZVrwAaxLJ2Rn+C6a2yWDhgdgrddIZ6ESBEQ== 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:14 +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:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 09:51:00 +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: [x83QdI7QragzMblO6NSLuwK2RatJmyUC] 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-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5ad7b3c-dcec-45a1-66c7-08d9ed3ba923 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSJybpSSbCo5zX4av1Jyrl1vFOHxAwnZPM2X1saJBBF104IWDbOj1oSrmzZ8XdCyXQypLYuT9bk1i7PtZVX9brI/qkNKaImjUidWtY3rkrpbQDKOslZzmBZD/E4bQmx8/NKebAfLAETzxaNRBv53akD8iYEB915fc7ClqBQ5CCu7n3zxddpD4ssahpMDbUNZdbgNgZdoSgUuPxbG/pM29/Bph1C9czvyFj8mxzmdMRdFpVnmCRcxt7AK1tTVMjepUdTDgRaCT9HxI6JdKRq6hZ9p16lEgetipFRAfN93pSNSa7ZOblEzu5EYgf3NsN0aqLfTm4wdYE3nj0/nzc2lBj+vT8m0wtHHC81IPPBHHc1Fu9I5CHUEwm4IgSXBYrHUywEZ02fFk9QsZCj8Qr5rNRVBh+psqro/hcq8t6utGV2+QGY4q2wLCWuEMcbcqU1hnWwXyzdhXpN8fiIgMJfH3dm67CtYMqPe9vdOTLAcXQfxt7jaIFadurU/wPIxygvKHmrfTWMQ0ImOcWtOHgJQGazAKx6kTZtcXDbyEXM3Nt+yp/64oBwTVjQIx7wEgchDNs/GrEjdd6sBVs1PIkl5lgLqNZQfg8FX+rVxKk1asJOlcJSj+2dmRLYugv64/VuzPmYp+5tmqOKRya3PJdT2i0NibTmZY+0UOKhglzAfWQlWfDKOCRuaDsxgoKM+tPHsK/3gUuf+mKir85L5idyfhz3n8bESB14RIOnlW11Kn0Kw5O8bCgf4oPC6LTYw2oapdE= X-MS-TrafficTypeDiagnostic: AM0PR03MB4884:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UTA26MQ6gyj4J6GLZJVWKJwPrVYooMFR6E0BgbhRzuhC8bpNS931QAjvjT87rb4Bjuc3/pnxzLXMOLZa7KwSluctgD79tsKZtybKp4ncOpce/tOQ4AMxgjDGxg7Z8LpYOKKa7ogJGBpgKNREjZTkI+6Xnzm3saDvxDZcgXncF0ueteXZBsvjT8ct8MdprnkJcE+zZU0PcdOworObQAOGRMr3dvz1RALqsE2u7SiqqjJLPv9m+gFIaRoIf9TD+h9eYc/GxO8MOcQtjaYjl/ySktMhCsPqXXFtEezok6g30p0qoejY/cBClhVpZ+njPkenMvonFqNgQdQqcN8OO9Q+Q/nm8MNyFY1+7sfu9k7B1rhp95xRGgA1lFZ/5PsPmMMbZRgyOVumxvSpJfOVyrKKtHDCE9GReLL1jnP25qY9OxzRMOX0AyCk6iJRjhnLgb+ZHByj07ZogmlETFvnwZd7cLLtZ3CEsW/L0fMyuy9fzXf16ZKF/Ol96J9mDwu9TsENPJEk/0faMMa0ei6Ce3xQm1rYm6vxQy597P4MGCQbNA7NWz/QNRIG4WTdzbzGgryBFXDdUziW8l4w66JYPpfSSw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S8q6FhyJsStMHnCI9S+OwV0mDG9KlDYwmkUdfxLWiakZBJV9OsuuFav2y9F38RnPw8ieg8apnaAvA3w55yybcu7cF4fi3YYbaORieV9dJLaDv7L4fc6aT+nR/5rUrXI4tJdG0YUw6uxzhTOw0X2NoXx99qcdS9bnrwuFMj/+TorY36YBbe0O7Z+G0b1Tqw595pFS0fHfYo6ZcKHPvaFFCddKmC/nhYzIPtY9TcKDl/IQQAmS0qf7mFmZo35Pl3XNMfnKjfMWuq9SUSyfTFZKdGUFrXAeRtBsixKrrqrhMBtigIUwLFOEZc411gMUl1HHSrOHPqqSKuVtoUtamy1/UpojhMrqKOmlyv8mVOFWUyu0jbvqo1IxanLwAe0cwqq475XFbMJAIFVRhRGhMWM9lwIfFJTVFLkYcM3BhdSyaKMQZTGjwGICAWIvuvV0unC6bVla0c2rzKNfUlNEghazleaBO0PSURoANdXVlKX5YEp86WKODa/rwiZiRrdJnj8QLVgagLqiKUNnfJr9EK0AHkTHO8kVnt4Wei2P9Xls0KH/s/q7Q8bKXAvtUGV+oGA69lIJxz7qYXHKnreHXpUpbHCK3qpfX/mW5to8ErhtykK5oSn+HjBg9vQhV/VB/Fy/T+7KuR79jFvOyN6Chmfd7xtpjrNXV+5h90McnJ321ILAQUVHd/5RWWgLQgVHBDK0LXM6DJR0XJPJ83XhScEd8/oqBB2O5mhOhCwO7+crzNrT0/WfYVHkLvhtZNkuZBouV+5Ud5AMYrW1U0oyac4eHMRR3mba842cQJ7zv8KTfQPaNKAkjxbsLc57FjGF2hTFP4G0N1x0iiZ18SNhzF32cllD7iLSuGhJXRIRCB8cQPQFRo474J9Er0ylJHcInXYMy/9EMs4EVGLl2sZ8o+IUj+SledeKkDtbYmMrSk9t/cktW66uUODWFpiLlMJnkCvnBhLFr7Zrw9awX5Zef8iEQQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5ad7b3c-dcec-45a1-66c7-08d9ed3ba923 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:14.8033 (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 5/6] avcodec/vp56: Avoid functions with only one caller 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: esmQlEbxgmBn Signed-off-by: Andreas Rheinhardt --- libavcodec/vp5.c | 10 ++++++++-- libavcodec/vp56.c | 12 ------------ libavcodec/vp56.h | 2 -- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index a3c3da7ba6..dc24f5b096 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -282,7 +282,7 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx) VP56Context *s = avctx->priv_data; int ret; - if ((ret = ff_vp56_init(avctx, 1, 0)) < 0) + if ((ret = ff_vp56_init_context(avctx, s, 1, 0)) < 0) return ret; ff_vp5dsp_init(&s->vp56dsp); s->vp56_coord_div = vp5_coord_div; @@ -296,6 +296,12 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx) return 0; } +static av_cold int vp56_free(AVCodecContext *avctx) +{ + VP56Context *const s = avctx->priv_data; + return ff_vp56_free_context(s); +} + const AVCodec ff_vp5_decoder = { .name = "vp5", .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), @@ -303,7 +309,7 @@ const AVCodec ff_vp5_decoder = { .id = AV_CODEC_ID_VP5, .priv_data_size = sizeof(VP56Context), .init = vp5_decode_init, - .close = ff_vp56_free, + .close = vp56_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index d4184f59b4..9819393447 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -773,12 +773,6 @@ next: return 0; } -av_cold int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha) -{ - VP56Context *s = avctx->priv_data; - return ff_vp56_init_context(avctx, s, flip, has_alpha); -} - av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, int flip, int has_alpha) { @@ -830,12 +824,6 @@ av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, return 0; } -av_cold int ff_vp56_free(AVCodecContext *avctx) -{ - VP56Context *s = avctx->priv_data; - return ff_vp56_free_context(s); -} - av_cold int ff_vp56_free_context(VP56Context *s) { int i; diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index 0a9eebc7ea..e0dfaa8981 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -216,14 +216,12 @@ struct vp56_context { }; -int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha); /** * Initializes an VP56Context. Expects its caller to clean up * in case of error. */ int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, int flip, int has_alpha); -int ff_vp56_free(AVCodecContext *avctx); int ff_vp56_free_context(VP56Context *s); void ff_vp56_init_dequant(VP56Context *s, int quantizer); int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, From patchwork Fri Feb 11 08:51:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3025559nkb; Fri, 11 Feb 2022 00:52:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7EM4cTMcHPRQ8kx/dEE+VGIvVQ+Gg0j80pLIzOaDiaBRdh635xKiYAvLgsVMoO+IPsbO8 X-Received: by 2002:aa7:d059:: with SMTP id n25mr799296edo.106.1644569521024; Fri, 11 Feb 2022 00:52:01 -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 dn12si15681340ejc.632.2022.02.11.00.52.00; Fri, 11 Feb 2022 00:52:01 -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=ZiIlMDrJ; 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 7A07068B261; Fri, 11 Feb 2022 10:51:40 +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 18A5968B205 for ; Fri, 11 Feb 2022 10:51:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mqGURN0oCkk/CTQmzFHVBqYMX6Qa+zFkqvv0AHZtq3l4ZgMgeUffREMAYAcNwQncqCm+JASO71o3ZLao8H0nQFLyRqm5s+rsAdcMN02spRRSN1aTeuOC75srS7yrVnQm01qXdgz3vwDVie/38W6t1g+vNnCQjMyMS8xlgtnO9CdcZVHhxnWEWYgOS7B4SFe3p8Y6KZk7sIsc/Kq32mrbFTaOapvLkw39bEFVMqxlUd9N2/4y2Bv3onyhfJJU/ikjMGU9iI8/rhC5elbCbrZS6tOyyXh/cnhElYCIivAgln8O6q+BwnDnrfYBc2HV6C671bz20XvbA76WHrEMBchTvw== 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=kPvRfUUrHDsJ90yUkY1qmd3MjDMjC3bet/IWqvchEzE=; b=Y/qwJmG7Mi5S8NXCkerS5a6DdMy/tEP/g764J9GbIaaG5rNNyiddT3hoVDLTcOcNxGeOmK9QLWiHfWh67HdwwcC6AysHOnauEYyGVPWhF8E2H2fKXj3JxPyUTxrI49vfJ/uYf+BtrHXbEhuqOGM2zmfZNHGtdIDq6RLE3ZMg/EvmqAaaMduSVq1icqF69olw4Bsbyd/5jXCxTSRWCyIAQ+7AOhQcIeZeU6cB0Q3URTIzsGvAMmWMAzrSisDwP4bTdMBM0s2R7Xk7fSsD6Gg7XCkJS4Prxxg6ggrtHLvoWBEZAwBRpHPkUfgs0kNAo225FLjB4T5aEMcsjH2jWHXu8w== 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=kPvRfUUrHDsJ90yUkY1qmd3MjDMjC3bet/IWqvchEzE=; b=ZiIlMDrJAW7f/ukO2OuAL4LwTDCQegHtKDalCNRCwSNGdeHDAJ+EQVRPqMJFWGU37Xrv1uoEeDq6yVQSjybnr+wKouZQXhOM3oNW1iW8SBM/E0SWtV+IlEo9wekk872dkRWWkyfRHjdc11NcNBBfbRjzqV+rj1wn18OcSJc7NZWr/3pXhDnkN2R1Q4Ce3v1GiFq1PmS++g4lb/S3CkVcXmbxQKDIXqzcvLmQ9ZUN1h/xccn+wCLHGCFAyEeJwbfzjMXA+v2vxchWHQGEp8ex52lAid4YVntyCWd70G3pT1DhM0h7Dzpe64V5/rvuSQzh2MDtTuybudU5SWcbu7nbkQ== 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:15 +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:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 09:51:01 +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: [E7OXPLVqWRXIhHO52OdBXd56unK6mIdc] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a4b3ca7a-827c-44ae-441c-08d9ed3ba9ca X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSJybpSSbCo5zX4av1Jyrl1CGHgjAMB3qFEnslQYwWSBRUEN70VuBj7MU2M1a8bUOgqwUcDb715hMkVZ4BHTXW5v24IggnFBkdrBq39Oxe+Odas3PvnH1XLODpqFhGHSW+9xrLPqjJFqeVpVjiilSnpaqhmMgMB7G7UiklWBC21kb4aN8k3dm1xhkoSnEvEc5aYSNUWwRsA22cP3vEiZSUHhM29/OpCpuoccvjOr5U8U3/jgT1GzxEh+3DvNT09ntrvYpd8ufT0vf8ctH3joB0/1pj5x54zO92KimhxFSwcqobFYx/wY7mELpOYfCcvJFpMZDkkDcIvoppLoGaJEKocg4HxF8nsP7MvxfcytLW/vNB8E0g/yxo7+yWoazXTyU4930gQTQvLaK4dlHJ9g02zLw4em1DAuunZuvHZWNYIbwb+bhYKuUeNFxZPRLCmD3clX7fmlEaFasijZndrTQuQjWZk1yR8QRlVfg79B1Gmu0CfPPny9P+j3yBXGnbexmGzS06JPgR+bVbIoaolLy4sYxF0MBf9X+zJyNmaH9DSp19fUU+MxGUtaQdgZWF2MaHxBTw3lUSwYJPTinS4/iUJH71UEWTdUJMd5WIe6QZZge9DVQi1Y0k1rFQn5Xzrpew2mqsRXxMq2noI4XUvk55ZvONPKYdVqCcFcmygH2ULEHWc0ZZXc7cVCTz6Vx9klITDUgvtcE57iyjZbKJzPu6Yq4DpDncCa6q6Ak6vSyt3IocTYnJ3LtowuSkheWSmNRk= X-MS-TrafficTypeDiagnostic: AM0PR03MB4884:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rSBhkwETHwW0iTcd9KpJLTtNrhtNtZj15WP9/5m4LtdwjjZDeVkQ7ZxhVE5KbG8rGReHlmxQ5eZGxmRFI/EcN8uv/k/jFA/LNa8puVQNTZEpUVS7f7y0mXdxb4nVmdYFkVRozbN6Cx6/jVJxVby0/70dgkcF+cvF4a8dtUYw/1iHFGw5fGdB8llZ7TuhhgZ8QLARGo98holfAcP9XjJebKYgBQ2loTd3T+RDfKOn8Ax8/Wjr3nh2d7k6lDqPwg/GvYJVxTjMV+XTrs+xJMVE56zUvZzdj/syg55AclnaSzF243/q1d327ZduEuNUW5hBKAqz+PxTmJmoZOgWpHvPugcGpE5Yjm93AJgYA8I9AnrNNPOE8xBrgeBTog7Ebjg0Ozyji6bTqVfyIyIQXQW2YQ1lRCQNMa/dtnJPQnXPdpzx/ILASGm8bAnqqViKa7grlFnBPVecUl5Fb7NBGJvSVj0MhpyaGkzxnjUKAGnuCWPPZI0rNPGBMuP5u8k2O2DzAm5mf7/ti8byQPxp7T5Zd0VgrfFaMauoEkXWkhl2A0Pjyg+XOSzO4lIk4XkswHwjao3QuLMZqrCYmpbCcgZhYQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DVnf410KvzJgH8rPgFCZGEEnwzVp71GVWoktFasofKYhDtteW/cgsE1/j0dsD54UvN51r//bp1nKpzOE9slWg2Qn26JoDMcezJ6fzCgmOvOzISPyknI790p8p4xAAvMcMAPrAjyvf7NbDjfERAFPjwvavaDnbwPEdRYWYhgXtFoqPdMcoQOnTri0sFZhWJb81WgWz8ZQ7oJ0K6OicjyMGoJiHJb//aT5M0YoAaeMjBV5ViXBmqBIJBpt/UT58WpV7YavDIi9EqpsRL+u3VDjPK8AaMEHF2YItSaP4seJ4HUgnG/7DzpeCtLTbvPxcGgBCbFaTaD+2IkvpBYB2JGgp9gGc68KRbJ2haCp3ZapH/xuMojyuCFGiXNIsImCrWpaUpCBV4r5+e2X/vJqfMQ05oIrcZIwiuq/Hg8yHaBUbeQZUu2QGljpueu/u8LXZjK82QEHmMWhZyNWp5FKZmJ6YZGAOnCFE5vpIk24+aa08RRSB5mEX4NA796+k983sGzktN9597JhrTcX27VHw49MTRIG1vFoih8DgOYmAJRV4rPOTqvb0Z8xEOeRovfgMEc9gxkUCD+ClCJtiAXFCnIu66qzFF9id8lpd5gfW7m6ib0Uk+HRmhYMtC41P5Vrj8rOVhcjpBbi8jG7hinIZUz7jbBLnUKLMxechCr5eYEWh9bij0fb3UOBszrTs4Nn8TF/Cm5xSIMkFvVd0ZfNsthljyVY728F7AVnlUxiNFXi6OblMQlhqDyU++/z5sDCcbmz2nEI1V5HAzHz9H2aN8fC/l1h8r/5i9o7m5TTf335K5aR3lGGqmFbb+0eRBwpZXkUQbACYq8X757vM6zqi0C0KxB+HwsnHDf9/X8stHyM+DN1V19jv9Tu26HTaDmZ5STEghHKo58jxQxgEtTsJeu0XzXT3Z8/z4kTAu2/sIs2UdWzJ4bSzDGPCiEpvrdn3PMGZDgS95Lray511se6Ss5lAw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4b3ca7a-827c-44ae-441c-08d9ed3ba9ca 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:15.8969 (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 6/6] avcodec/vp[56]: Mark decoders as init-threadsafe 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: Cw/h4deUE0dS Nothing with static storage duration is initialized by these codecs. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp5.c | 2 +- libavcodec/vp6.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index dc24f5b096..6146fbbc3a 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -312,5 +312,5 @@ const AVCodec ff_vp5_decoder = { .close = vp56_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index ae8e223349..40d266916e 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -721,7 +721,7 @@ const AVCodec ff_vp6_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; /* flash version, not flipped upside-down */ @@ -735,7 +735,7 @@ const AVCodec ff_vp6f_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; /* flash version, not flipped upside-down, with alpha channel */ @@ -749,5 +749,5 @@ const AVCodec ff_vp6a_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };