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, };