From patchwork Tue Feb 8 10:37:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34165 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp678604iov; Tue, 8 Feb 2022 02:37:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1C+ICt2Kuj6eE+ytnxNH2uyCuPZcRH2iUdg3XjJ8tD1/8nu47jRVHghFs+QdqTCddRh3u X-Received: by 2002:a05:6402:27d4:: with SMTP id c20mr3762060ede.182.1644316660988; Tue, 08 Feb 2022 02:37:40 -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 g22si9175537ejt.20.2022.02.08.02.37.40; Tue, 08 Feb 2022 02:37:40 -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=DL6R3HtL; 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 608CF68B1BC; Tue, 8 Feb 2022 12:37:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2034.outbound.protection.outlook.com [40.92.90.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68FD468B06C for ; Tue, 8 Feb 2022 12:37:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V668kQleB9M0yJ/0hcfp/zJ6V7Tv/3sZ8qunQ7Gp8R5dWvQUdUI/6n02FBH99G54xDXbS3yjhVMpRMQK/08L6r+3FDV+rkmiB2mVFqxhZSalvwkaasWqB8dSeD0zML6JZWSDIBQcTHUYsw2OCqKqgi8+ij6Tgud2WWd0kMkznO2PFrIvTVgRbguzyU0o8DcXM2qiWlCXkjKxiNMPM9sRkH3I9h/BfG+vTdw/47LPKI0glLcH+XwMuafOYeulQHpIho3fcNap55hF9KLdYNcUtTrgFjOPl6WcC+Fhep5rbAdphN9oP84Z3EpvM+5azHcCKHkux41PrvdjEl24rnjXhA== 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=qI3duXM8MKPy8dnFdACANrN/CGSi+TyCfan7Nzl01lk=; b=lHk/cnlA0UZhJs6jHqfsQz8jDlGZtO0Jk7V0FDL25b6Qd0MFerHePjo3oiecHRYL3r7E+IHHZJluD/YslTpmI50q88Iy4E1P/bbjvpvW1sVHKu7B3yoduXoixhmPzTY7Uz7g1ExlDST+0JjPASRY5G/Zo4wRUMonIiEpmYxGTTKyuFQnZEpKnGZ9AUv69Xtc8YCFpdxPxkFlUPhu11BcqW9eidVwOAfAqMhaTzLLhWIunM2EnsILMmaU90vgRu1ZwC6M+OW8LAi0b0Qb8b47YBcenGkJZ8MrL5vzsXb9rD9uCjy5sgPF/XwNnxa4hIHZNI4yIwZCp8tgjUIHfOyEbg== 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=qI3duXM8MKPy8dnFdACANrN/CGSi+TyCfan7Nzl01lk=; b=DL6R3HtLrELXaX/Ffju+spvA+qv52Kehd9SiUOIBg50fqXjn5JXwSu76ECNQmV+fBb0aYS5ha28Vw839wBahk7BupByFkuqCHvrQGpF1akaJf5E/IPnAg5hCkz0LA5t5hPGO3VMppF729I7wsCTB4Y1+8ZCajOhyG/sULET5sFQ595kLcjoCLNhOdE15LX8VoxtLBzWVLtE9ndkR/iGdtxl47qEi8iiRl7UANOkZ8Ao4xC9zt0xa5/oEoO1kkrpeVHH27n3O46H8TrlIeWH3pPuZqUtvkf/0USPpjqwBf3yCDa3XOq9HylBlqx0+V5Fgh3i+wmtW6LkVLqvmUNdyzA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4842.eurprd03.prod.outlook.com (2603:10a6:10:34::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Tue, 8 Feb 2022 10:37:26 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 10:37:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 11:37:14 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [5o1nFaR0H0QFxflhjlosGGT8ZFP9tgBZ] X-ClientProxiedBy: AM6P194CA0054.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::31) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208103715.1073699-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44531766-958f-4974-b96b-08d9eaeeffa4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjTdr2yxJdt64bTh75tC0X2twwdk3ReqM4yoRrwixx2n8VFmvH9/TQbpl+sJMdYat6yYT33w2fwOEEJS2WT+QszGwpwTM6mLSojePH6B8P9WocVCTl1vC0tmJ63Tx3jGCmFIsfUwrCpLSobOmJnsr9MNH0VFz2saUpMEyHfsXYeIpBgg63hv0WEWIPh+hSJ/+Rk+6WdjSHnZGylmlFOUryOr4j8YvFjGhw8009hI5hC6yi9fpPVbh3/qgFhP87atMOmhRJKyvwiHRJLpsKUr77LTxHVkgooDKAdLwt7vRWCfSOEzlQ2efRIDgZ+0tMAoc20OuBNu0zj2mGL4LnvA2J+AHCd+YJPFc5ZaaS2U0Mfu4v8QkYsRhB+nD9LoX+8Qt0aExu+CfO3wzHpjM73aD6TzZAm2K01kXkUhGEa/Ovdx5woQDM74BL1zQWYH8Prd1IrVg6TUkR+aA83KQfPAgkwrtXyJXdw660nTNpBVEqJ6PauWfwKB2X+3qqcYM6X5NchcD2v5dEzKxsMWkiEKRpoJfQ+uNnepuPbSQXqN//QtXQvMiGLdOxn8arOaq/1+C3Bv7NmEntdbjxwDk7QTTCNcmOjgtnfTnGYQLWrHHaQUd+NHodfwcHlj3Uz0s3lYu1IPrNnfD1dqe8qSM6IcQjvaTnERj85Ck6SJFg0DXNdUMZb4iCvZHltpbzuWl1uVX+hKIBJd6ySVXcsVAObqYgsbdNXO6Yg+AwGJl44LhaQOk= X-MS-TrafficTypeDiagnostic: DB7PR03MB4842:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KanjJiFCxDsqOGSFh1et5UFLsB1+0b1bqxXzSrPwF+573Hvt3+QrcgMhmoOhJq2YR/+JckEENE31fBeUvGnkBLRbGRWIUp/8e7JKVQNI5QZ9loNyE2UeDZGakEhjO4AOQ8BKgkcttN8jum/3c40xk9+rGNScbv7K10Ge0Jcvsl2bYxTTbEVJRCADUZbVLVzZw4dKTBZW7m9RIcw+/FU4aam3cM6vjtXTnVXnoB6EeF0OG45rOaQ5VUQ2TnsX/olQ3JUyqhTbljG6xKYy1T200lFdAms9W/kx895jifw7z0Bt4rxT2+SyjOugIP7Vi0sYfDh3Zrcvm7Ily8bk22/Cv4E1suBdbsUM+JAlbFwZsSUnMliH0vetufDKyc3dVuoepyJYfuMxcBy0LSb9C6XvP3X9M+scyGeuuREAobyWBpJMY8p88Gqm8HRDao1p86PqTZAJWwN+v/1ff0wwSC+/1WcC9Mtdn0yh+od1UNl5CDdm66Kv+DUHmOkHZIDR6SRzOog5U8h9NhlpT/flCLH7T1yttoO8MRtCF4loCnFdEVWj+kcH2eDwJ7qgb7tVbtcJzUgQEEYvg9zKUFMuHd1frA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z4Tbqa7l7jvR9LhXYCEYCiEVptS0VNBSxwnpqS+P1d1S0QGO3uBimMlkfhobwtNK4a9lAB2q1NKAEAdxRhUESy65Ee9odWnLGJH9QgDcrKx+vCcJeCkGLk5rc5WHZcmbtjg09F8wM081TKeL1F/bPqvNrA13POwKAk7VQy8I+hDOK1TcgAz8FtSkCPpxhDaM0KnHf5JIWAVX3ZQtu1IU3RZqgkPaSlosU1lAvxhX+nQ8RPqaUSc5kpHLVUL2TwUH/f6KOfiaF4Pgoqk7ag2xfiZK32Dt0lcWYdGLRdrTzHq77kcJUsI+WEhkeH05sG+huFzyehzb/gD99QY2MnQ0+S9toDv4uJ4byFuWR/KNLR2taSk7dRhRBbTRbsJUlEAuMrwqYTlOfI/+lbrYSTfLPPMbLI+1vWeqdJYB3aLgWPyLtqNu0mVfmV3GCKwIjqW0n+NgmDhWClPJ/af6tV2VSRlvRUFTL7QZwZ441CFlZ9t2Bp+l1jefolNpXDa8l2gw9jCZuIlEfd9WwIppnleWdqTlGAuDf+WCVKfmw3tXix5cYpJhz7C0oVmLzO/XLg+PjbwwwIlOaZ/f6Nugb8M8yrgHZ0iz8DUKO/4WIRNji0qXmqocCD9AV6G8PAaJwdS1Lu1lGSlGOugrtswDCn5nEVVkGyALsFkjVB86wxOY6MrIkaF6AZQ+OTIIt4z/7FaAbdhAJXbqqM7D/ImrdwNaEJimPT7c98iUyTiV1Y0c4ImMGEgcuxkfaW7fPdCe/dhIldLzdBH8M8QUS+4BJev+oKkA6iBwvL3+OXT+Rg6bNGxFY/tTZ1MEB1Dv4f38fnFX549cKev7QNLTgDxp6J+JGlPSQyvRMlKFqOOaWmYM4gg+66qExY1/JsHd6jX5zYzxdBfKLsQtNs+gWBlmTu1K8CefMlGhFxwVhbzoQ9tJSIWGA+dy4vqYVVgZkwmpYqbhP5uHHu/CgCcDqW9HwbTL7w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44531766-958f-4974-b96b-08d9eaeeffa4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 10:37:26.4236 (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: DB7PR03MB4842 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/proresenc_kostya: Cleanup generically after 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: msr0xwrAH15y Signed-off-by: Andreas Rheinhardt --- libavcodec/proresenc_kostya.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 85651fce2a..08a874dd4e 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1274,25 +1274,19 @@ static av_cold int encode_init(AVCodecContext *avctx) } ctx->slice_q = av_malloc(ctx->slices_per_picture * sizeof(*ctx->slice_q)); - if (!ctx->slice_q) { - encode_close(avctx); + if (!ctx->slice_q) return AVERROR(ENOMEM); - } ctx->tdata = av_mallocz(avctx->thread_count * sizeof(*ctx->tdata)); - if (!ctx->tdata) { - encode_close(avctx); + if (!ctx->tdata) return AVERROR(ENOMEM); - } for (j = 0; j < avctx->thread_count; j++) { ctx->tdata[j].nodes = av_malloc((ctx->slices_width + 1) * TRELLIS_WIDTH * sizeof(*ctx->tdata->nodes)); - if (!ctx->tdata[j].nodes) { - encode_close(avctx); + if (!ctx->tdata[j].nodes) return AVERROR(ENOMEM); - } for (i = min_quant; i < max_quant + 2; i++) { ctx->tdata[j].nodes[i].prev_node = -1; ctx->tdata[j].nodes[i].bits = 0; @@ -1415,5 +1409,5 @@ const AVCodec ff_prores_ks_encoder = { }, .priv_class = &proresenc_class, .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Tue Feb 8 10:38:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34166 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp679060iov; Tue, 8 Feb 2022 02:38:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcC/DvcM0Wt6NXJ9a5Dfg0sMVFRqAqDFagtcI8M0Bm7sh2l/p0ybOBLwLIHGhln+lTD802 X-Received: by 2002:a05:6402:2741:: with SMTP id z1mr3782806edd.264.1644316704138; Tue, 08 Feb 2022 02:38:24 -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 di4si10189980ejc.497.2022.02.08.02.38.23; Tue, 08 Feb 2022 02:38:24 -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=UCcGP92H; 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 9B50668B221; Tue, 8 Feb 2022 12:38:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074053.outbound.protection.outlook.com [40.92.74.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B6EF68AF4C for ; Tue, 8 Feb 2022 12:38:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b5gZyDzbWx3PBi64hRXmUuBqCjEBHFkfy1MZq8iIvGIcpSX4JUOcAe2KmHAywvKKpLWOKEkeS4mQey7I0RHdZWtgTBNZSZw3uSmlUQlBkiqTbDO7ZxXR8UzD8Vcd8a9Gp2OJR7GPYSZVjbz6R+fPMIJK2oi4CTM62v6awIVVUhd0W5zMsrhGeL4J/beUcxEIe/VIQbiBRgFjSB+EBeAoIQ5ccWTwEIROdVURx9RCo2f4bdqJnJhNoB59W4fxGD0cY75iZVgnvMEOu7oR8la3BTHhoLnH9fkDUWxk1JHQX9VTJjvIk4mgNshnxumQMZsFtSih5MDOSoOg13oIog1M7A== 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=9njEVXIYD/K6IHg4M87kopAibU4171PZREFD9PGESCs=; b=ElMZDwTo4idIDUCeJYiQvkI9u0hTUOVYxJe040p4I8z7gK1aRoKkVdPizWNsvhT4zPdPfwjI7DlVnqziufMDgMwH9da3eY/ak6xN3632Z4cRP+f4JemsE/bxXdzYTw6eRHDVzMLde8fptEcegF62rVVljqfM5AftA1ka7vA12jAcdKm68OXHu86r5F0ORXqz2/lEkN2nwZqH38kTRZqf5l5Q/bDSawfjZZ9pxvVuuR2o3jUDC6Vx2vlZuxUNShk58ozi5idRU5ivyzp6lThCtUIrCNb4QgF3+6VsLCqhcgf9SYxT9PhwyIV4478oe5sF9H1TpTV4YbGHn57TgGUyXw== 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=9njEVXIYD/K6IHg4M87kopAibU4171PZREFD9PGESCs=; b=UCcGP92H5/YROooeJlWsNwzTodfeaNhxyjNYIQUxVJ5MecLYUn9TpAbkpxW2PXhO2lGGWV/4OI7AINFLQvzbz5wYvPQj4w4BDixarWqBpbkPYf5qQJvCjwAREqX8bv0++6OC+DRwtrhHsh+DggivthVCWhqPZYk2HGpBBtl4QTBQ7w/b/WOtxLy7jFcGLFs1yCcT/CoPjt/xsiqT0L56LPiO3E13MrEEL7cVMI7c9Vhkh8Ji7bV8XNX6L/LRD1NPFg6OlpgTE/J4i8h0gPYGttqpzgb8SpVLtvFuHeclb2bvg3jCq61SjSd2chr1Zw0W7pTsgtKVkQKEuB0pGyiZTg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0301MB2575.eurprd03.prod.outlook.com (2603:10a6:800:67::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Tue, 8 Feb 2022 10:38: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%6]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 10:38:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 11:38:06 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [UXoLRD3V85TSc8C7OUkqWLshmAmgzv5U] X-ClientProxiedBy: AS9PR06CA0098.eurprd06.prod.outlook.com (2603:10a6:20b:465::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208103806.1073822-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 835b8517-2073-4c2d-9952-08d9eaef1bbb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjhkhJvUfVEcIrifrSP9cDU+36LOSCzn+A1oct/mC00asiwuX2U4eiGNjjpQfWuKlrZ+SOsflUq5cRAahcpWARjIoiDn59N5lQt9I+RoOd8ckPMu6FOnZDSfHZJyGKtrkzCV1GoE3L812X+V1kfd9IJOCvcm+Jj9k5qjapZAwYWNiRAZcYrzaZFSVtCUWnZjSrhlcF+PECKTwngoyKZrn3R44obppClsppj/uzqXdHyCUB9GwhUNKYxxgZXoSqoxtLaMLJaqZKkLT64qsaAKtiFAqPhA0IyRjdhzXwYbxNVNyuxwCMTF4peUhMzbNP/kgwbuFku2OCAvxHQEuUwsxzDuHIHMu1kVZ8zqk08Z8wTwBrBBACw5ezgguGkpHzRi21IWpA/X1hkE1flCWk51gsnbPSoNmtEx11YVI2DDKV5bMnBudKVtuoe6iX/vspa0ERSQclyPaB0wTBYo/tkxNUNOu7uafVbcjC5bOnbqebHURdgu+iznpeyg9bm6JyLwsX63RhFNe2EMeXN1bybiaJHIojKNNMzXYDKkA2lwZsi0ka/xyrLBjDS4s+l6FjbbjOdxQL21jbvoQmJKeXseenhoRGOFHKV73BjJY5sqrpDcRdHKnDb0g9ABy5PgVbLw+TBNXo7uTAmr95NJwc655/7P1PMk6WxiMwgCsPbi5DJJ0Z2Wpf4W1weciPJYaj+jz2+9KX6pe2608tMo6oQSbLQ8uTv1PqQJ0oKDUUPeDLg/s= X-MS-TrafficTypeDiagnostic: VI1PR0301MB2575:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gi6OiQXS1Q2UAcMir0DPpB71Uf7DnXPAGI5elysjiQJ2n5Zq/Wq/XJqSYFCk0SPd1EFQ2R0gI0H6VKZhaNt16LKh0kk0MHabHuprKTWhVyjL1uyrkiLrk+4A3kJY/4ZmQ+e6WpQjHRlXMDGSIIshlibELb7a/46UFcXgDAtJkY06/WURyryVHXhSisd9KUjUWawQAm+GEZyf2UvaM3RIFCPDVyTbwT2yXPjDHHB7UcvL55YryVrDttlPS+zUiSbycDlMJQqUKgf2iPSk7WdNL67FHwnRQNrzxPjold6P4KxE5heapFBTSkBCOp7MhTrZzBAawYnhLr3tgwZFLsBABI/JyqdfCZOUMzTCqTnUyoeBNF8NkvFQYU/jaI/ONwQ3nJ3zeiPDp2ON21fmIcDOjyOLBKG9hIGEWGtcpn2TP+E3jhweDY63XkW8xSIEG3ox3gKNk/s8mkUosjQq4r7Tq9ate26EdPwuxWM3JOZM9czpLkboRe5lP68PeT0lYNQTfpEUcZAC4GeHvfJa1/2LAAgneQn4ZnOCyDhIMrbecfKYhoFdliRpuRVZbGzSheT/6GMRHWvQaqTxx+moVr4Y4w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rwgUnijv/OlS7NSgDco4Wfup48WhGYO2IsktQS/ffIOw6ujFa2p7Ssb8hw+hxmWNYdpICYr9b0HpmnBPGfaiRK7Fh44IOkIPdAluitC5yuYWug1WNQEAF2qAVw5t/X7u1A84i8cveh8b0/1rbRvMLCFrAzwMicRV0dioNGrKZ9e6VGnCsiTmKzakpVVeP/Rye1IJLEDMen4WAmpwAZ6kJ+RhSdAHvhdEqa84RwD5B9ZuY5OXxjafsVLlc04nPmCz2M+VW5sDjtq9H5eH5O3p5a+TaxcG8js3m9yxkHJaqJ6Cr4by8Pr9mxrhnNTI4C+O4BiYjMh9pzlP5UoFUWPAJiRtkWpVF3UrrhyRYlH65gP0kNQI6T1J0oUt5/WIHaYDX26l0a+hboM0kUe1jwNJRPa4ULzC8Qf0F0M4RMYJa5oBAHgYRhdg4fq631lDQR0BRT/+wTw0AOt4hPvoiPwkdQNRHjXsWXP7Tm9a8kaev5W8AwhEkHcU8C1DeE6JTZnvfSZUD7X4C3D5D0vRt7ZFz3AowULpCHgsMzrfuc4rCMglHBD0druANw84QDiJjzCbj/tuilbiEKHNe0160nk8GbBmHUeNenfSx3H0+l+BnzHtyoyxjSSxO5/2t9JTp3u5KaXKHokmjxpuoK7pJhDgx2oK+d2Roe4qoOiJoNVHHo+DL03a241EXWlEZ5O4R31Y+tJGHG1xp6aszSI3h0ARA2gIGiqaRtLfx71BWYUJTec2FIHJkGSGYlww+HN8nrInPgecnGztth4lz4DrAjzWDj48duGx72akYJnKtpYk4WKe950rayZr4X2B5ZT/4o+3TmZBCXj9GCA6sxZAsnTJdom/xX7SXKJcaPckU9M92MsWwqZacJXD2fGUs2kQnXZqZ3JWHEne1Vtcb6TDl88/YuWfJZzHYIzxIKKLPsPXA02pOk77hRG77zj6/JWlUEvx/FwPDTgmfgw6+5nc1PK4xA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 835b8517-2073-4c2d-9952-08d9eaef1bbb X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 10:38:13.5029 (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: VI1PR0301MB2575 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/proresenc_kostya: Use av_calloc/av_malloc_array() 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: a8NttvAvXeKa Signed-off-by: Andreas Rheinhardt --- libavcodec/proresenc_kostya.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 08a874dd4e..beceee621d 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1273,18 +1273,18 @@ static av_cold int encode_init(AVCodecContext *avctx) } } - ctx->slice_q = av_malloc(ctx->slices_per_picture * sizeof(*ctx->slice_q)); + ctx->slice_q = av_malloc_array(ctx->slices_per_picture, sizeof(*ctx->slice_q)); if (!ctx->slice_q) return AVERROR(ENOMEM); - ctx->tdata = av_mallocz(avctx->thread_count * sizeof(*ctx->tdata)); + ctx->tdata = av_calloc(avctx->thread_count, sizeof(*ctx->tdata)); if (!ctx->tdata) return AVERROR(ENOMEM); for (j = 0; j < avctx->thread_count; j++) { - ctx->tdata[j].nodes = av_malloc((ctx->slices_width + 1) - * TRELLIS_WIDTH - * sizeof(*ctx->tdata->nodes)); + ctx->tdata[j].nodes = av_malloc_array(ctx->slices_width + 1, + TRELLIS_WIDTH + * sizeof(*ctx->tdata->nodes)); if (!ctx->tdata[j].nodes) return AVERROR(ENOMEM); for (i = min_quant; i < max_quant + 2; i++) {