From patchwork Sat Apr 24 11:14:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27252 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2035561yba; Sat, 24 Apr 2021 04:17:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnqWfdhq5sFWC5q7llv0po+Yd0E6tPZ8iFbsZiA5OfEDhYl8YCW5f1EiFqDRJPJW82rA/+ X-Received: by 2002:aa7:db9a:: with SMTP id u26mr9635267edt.292.1619263035942; Sat, 24 Apr 2021 04:17:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd10si7139304ejc.600.2021.04.24.04.17.15; Sat, 24 Apr 2021 04:17:15 -0700 (PDT) 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=nrfB3tDl; 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 2C9F968A141; Sat, 24 Apr 2021 14:15:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074067.outbound.protection.outlook.com [40.92.74.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C79B168A044 for ; Sat, 24 Apr 2021 14:15:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nqxk1kUHOhSgzC4g/yESf42tDomkMjeZetVepDqqrQTDugE1DwyGEIZaiSAmkbBZFa8HSQxl8mIGv3Uo3JnfSOUjBZvRZjwt63yGZuA9Uq8c/zzfxyw+4pUfrgkXAc1JK9gg/upmTTmanQbctT1wGN/Lc7o4xVVMVPSvMMJxqX6HmVKC53iEx3bET47D3XtZEfd1uPrGc8e3c9Bpazy6Sje77FY3UpFUa/VM/J5LSu+6geQnOaWQOjG8Phab44ZtC9U7FEFqqzSmS1Vr5aXjpqYF6O5BtjqiW1j5NpboyVdKuFcPvREy/5ooabgL1DR5hiHroVlqPDMhyGgAirGWwA== 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-SenderADCheck; bh=g1e33MFFOZ6w1TmCU3ys/MatqPJwmdfANPE9YunIfCg=; b=b6SOKVfdXtcGz+6JsXiwl6azYaMsrii4RDDxedMXN4P7BZkc5ZupN/Gv1+czNkaN9Rfq/gtofvxrEmFLB1ZbkMj+TYhoownASv64Hfq1wmKDnc3r2yNDupuvKE3tEjuo5+jQc9u+xGbVgGFA8tYa2L1NYnjRQVrK6k3t+8ILjZuYSM8pb4ptUhq2j4frQFeH2rLA5qD/dAr/k+D6YKvt6lqKopCwkudoi3+3Mx3xMZ3tJRfoYkesW3/VttQaC8qOG+h6rV1bTtkhJHqxBZb7+NUpOySMElLqR7mZDeMACt78bedkHwLUBsu4HAWGoC2skb51OOBU1p76uOLIPRYX3A== 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=g1e33MFFOZ6w1TmCU3ys/MatqPJwmdfANPE9YunIfCg=; b=nrfB3tDlnxUUAdqbA+lZHrG7pILOC42xZh8JBFsnhcDoXLi3JMCqElrCd6Tb4S/4RIoZWy7cqyL05XqH5szXxAePfgoPoTiPAvsjTFLcb/sWRMZcq1hmWvHUjbP4mA5T4wHSuIFg+6ze5kNojfP9QL2zhiZgIH3u4sH68YNNFRHoHddGVKdIgM7BFGaDcSlGm3M8EZbr6/zaZ71JwHKoXo0O/g2FArATKvNkJtQPaqgHhQu0m98zMV4JF/Scu65hXK2n7816Ahbo/LEVM24pGYHRGx3z8onJ8+M4yyOe+VUDGxv3LvvAvNeVpaKvVMJAvfiwfD7zMKSUNXV/foO5iQ== Received: from HE1EUR04FT042.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::4a) by HE1EUR04HT211.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sat, 24 Apr 2021 11:15:38 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04FT042.mail.protection.outlook.com (2a01:111:e400:7e0d::159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 11:15:38 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:950EEB6111B6091940DD26D75076CA21A474BB4A1754D8B1CE758277BD48EF5D; UpperCasedChecksum:FF8FB14A1E568A33E928884766DC44844EC897AFF238457E1E2BEF2680CA1DC8; SizeAsReceived:7593; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4065.025; Sat, 24 Apr 2021 11:15:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 13:14:46 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [zmRWpLXkwXuvnwTEcpcpn1CWPLsj0v6y] X-ClientProxiedBy: ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210424111446.30338-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 11:15:37 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 390241c0-b478-4b13-6a93-08d9071249eb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSHACczraePvIduOTLAdlim0sDX9Akmx2PcNGAJt4A/NrFeeWumQExBhpW8hZMxlPtern4GgOVlhEYvospualXpiF0pY9CcPQE13QZWIkC50uP6brmDKCV7xqhYs893GjmE8mP+2EJum5iKVztl17bzfuoTkYJxCzW8gf3U51FBAjxg9a48JI6qA3SRmdz2qDthYXag/nff8QwDa5uZIdfb4d59BsD172LP/1nAJuP87s2gAIhgc9KYRotN86EgdFek2K2wS/ScH9qMnIpbzMntz21jAuz3LuvSzk/kqTNM8qjIOA/8rRc1rdPFB/LS+jdlRgH1/mHM9I1mBASvyqxvww3YrXxy0EQTuWLa6Y1LIUq1sqXcAm6Pj5GyExoNngKzkEFZJjmGmSz1HVK7WmZp7LvjjVQMpRKV/LWBGXl9RiibN3xGDYXeBCepGyrkCcM7jCJQ/HMRGUjjK0BtmNVICLdB3Ec/tuQUrGOPbtnspj5Ixn80u8fy17njgmxOYnxIM+z4p7WTARrwtZvycuc2fbZzG+K25cGKC7xP7+BL9s/Qmk4Rirh5VRHRgroWup8SXwCIgmaf0vaH/lLFgJvUhHzYAuWMCwtgFqfFX6vY9aZYFIWtECch2TNBswmKFKvAnXimIsGvBcFhK5Gam3j7Xf/f3ozieq+QBDQiTSwaSncbMT6WNyIg4siMNEIO0DiJMsasAM4lNHBaOnt+qQnakm9uDqwQwdsUQGgOsyHLyCq2HmrcAeS5ihy7vwIJmiU= X-MS-TrafficTypeDiagnostic: HE1EUR04HT211: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BEpa+AVLcd2xriVfKCDF4UwKCTzfZAWJthOWGCTH+s5XPUPrYwiNmAeR2EzXwJJktLmtYL72B3jfPZV4XygvHvaC9vTzfTSfWjDEJMoqYTg5ZTa45koHu01jVjWJgew5z8VD9SRso+FX7UAVSCr1aKhhBGX3AJ1nXeP7NUuGpmRy6tM0QgXwGlYNUC4Qi4335/RUrwszt8LRRcmNOW+hJ+n0umKuCl4UWAn+Qt7kohuPPqK6nyWaEwY7JmWID0T0LBAt7fi3YwaLaxlwcbQ4imYtU3og/FBa5fSTw4lPlu3QMlUBKhtBQ+F0uvH0+Mn+wg2FtaoOi0idpZpMc9qsa3Ykj2fbGXMwyfqA1F6hv3fzoLb26ypgFjwKNOwxmSDGpx1j6/WmFE+HqmFbX22WSQ== X-MS-Exchange-AntiSpam-MessageData: GVI1lsi6XyDx4FCZ0iX6229tjJPoeCWJI9q+FdBRDTEjCCDnp8KO1hbZbp9QhBp6G51WxRuErIKqNmMl01qucQAY0fZdl5s/YtqAy6o5PgCWE50ZsY/ISlhAuOPAXrOZ+J4osHfeYnAB1TmOZEwCDQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 390241c0-b478-4b13-6a93-08d9071249eb X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 11:15:38.2995 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT042.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT211 Subject: [FFmpeg-devel] [PATCH 14/14] avcodec/ffv1: Use av_memdup() instead of av_mallocz()+memcpy() 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: 17PdcXuoET1+ Content-Length: 1414 Signed-off-by: Andreas Rheinhardt --- libavcodec/ffv1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 8e7542f918..a5f5449602 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -120,19 +120,18 @@ av_cold int ff_ffv1_init_slice_contexts(FFV1Context *f) av_assert0(max_slice_count > 0); for (i = 0; i < max_slice_count;) { + FFV1Context *fs = av_memdup(f, sizeof(*fs)); int sx = i % f->num_h_slices; int sy = i / f->num_h_slices; int sxs = f->avctx->width * sx / f->num_h_slices; int sxe = f->avctx->width * (sx + 1) / f->num_h_slices; int sys = f->avctx->height * sy / f->num_v_slices; int sye = f->avctx->height * (sy + 1) / f->num_v_slices; - FFV1Context *fs = av_mallocz(sizeof(*fs)); if (!fs) goto memfail; f->slice_context[i] = fs; - memcpy(fs, f, sizeof(*fs)); memset(fs->rc_stat2, 0, sizeof(fs->rc_stat2)); fs->slice_index = i++;