From patchwork Tue Mar 15 20:06:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34776 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp3314955nkb; Tue, 15 Mar 2022 13:08:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyT5Wp9T0KHsCSO2V0zJ0ezRMdPtZCLi7iDYRpFNDxzO5gb5P7BNG7m0v9UzlmTu8EOkVIU X-Received: by 2002:a17:906:d54f:b0:6db:af13:dd8c with SMTP id cr15-20020a170906d54f00b006dbaf13dd8cmr17953856ejc.540.1647374902528; Tue, 15 Mar 2022 13:08:22 -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 o18-20020aa7c7d2000000b00411b6c9bad6si38748eds.79.2022.03.15.13.08.22; Tue, 15 Mar 2022 13:08:22 -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=twGsP+z4; 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 953BD68B13B; Tue, 15 Mar 2022 22:06:44 +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-vi1eur05olkn2068.outbound.protection.outlook.com [40.92.90.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 827DC68B02F for ; Tue, 15 Mar 2022 22:06:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HUKyk52fbB+bA18KHzwOeaBPi1Onjj3T8KmsTgSg52veFecyiO42MHaI1GIuHXDG7bG2KhvSFG8QZ6DMeyX5YQsM/95pIrHOjiaXJcHUm64YxWX/nCFqctjMIiPebet/xgdRzOYji9NV6S8y9+wI8Z+MTOkVwwbd6RGuBOaItNdHiEYKsCTdW+T39SzEQo2P5aJwC+llCkVdul7rQZSPSQia8ZH/LrBRGmXIqcNqnDPEyK5AHVoEEax9DuOxZt4wIPOvzVXH5aFTuWA2uGSAhuNgcY6egghfMli7+VUaUNWpy3CybIfbuLbDcszqTsqZb0NPSCGmabUCCbPefeyv4w== 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=QS+53hhSEqkmWUV+0JghFLsAKF4QLq50NZyHOrJAHDw=; b=npqQVZubDGLCG4RiKq0snWcirQPjwbXG3y0DUNbHDM3CGZb6vLmLUt8NI9j2KwAk4kRuy+ABiFNvKH8Zy5kBZ7l2GoooKW4kC5StDUOqvsliJxrbnbI5MxGpmJ7anLdD8dFHs5kROXw5gBX/YjIBCL+fBEr9uLnKlaQzkIJfPNtH6CAj4biBCVHWDB4IRthFl+r3Ms9JxPhN52R7Dx5bqYVnYEJdTOBG7Vxrvu3A45eT273+bs9RzWctKFYjy+PepdxoX7OfhtUoAa5xp97T9BHSPWE8iEMlPiuGwMocckMI2ExjqKAjFudzdmgqSAIaxaLXJw6er7N1d+wVgSTeqA== 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=QS+53hhSEqkmWUV+0JghFLsAKF4QLq50NZyHOrJAHDw=; b=twGsP+z47Z6slIVmpf8JpBZ2b4t92XtcxwyTHLj71GCWsfC0z7GzfZviPn0ApXsLJn01LBiCnZwczX8hPviyS4AqnDeP1gJBHzXRzffudOAisooV+ZszyidGEIO16/9OSBoBl0fJwedry+Ta0xNXXfFwlxlJLiK6fqLpbyTZjAa4DjHsHh4Km8iH00Sk8CoS5V7iTJ3bTxIwKT52+9rads4KFr/OlpK2p3HWN5X4yZDZOAr0CtOBoIZUyiz+NlMIn6V7JjUycPxU9iEByEsN4vpfeh1v7jzgClWyQGIeVLuSTTC5AKEaD+8wDCMH8QLpnj1P+mszB3bBvjxFbiByZQ== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by PA4PR01MB8947.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26; Tue, 15 Mar 2022 20:06:40 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%4]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 20:06:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 21:06:03 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [IlShD2yFO4MpcxQjNrv6TjfbOpSdgKco] X-ClientProxiedBy: AM5PR0202CA0004.eurprd02.prod.outlook.com (2603:10a6:203:69::14) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220315200611.553534-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33bfda39-0a75-48bb-271a-08da06bf5181 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQIK6GOv6I/5+ncmNhpuEjVCjBL1ahFAC6IvHqXLqxHn9aYOuOKyoCFCqSYp5hS7bq3K7dZjoDh7Pgs7MuBVhy/nWoqrTWOu3XFOdDKGm9542LElIdfMoWFOy3oHPgPW4tBimWuhdfDd3Iy22tnyrgBROVbyhV1ZZVtKa5PBZj7grTrEa/aSngFa4y6kQ1k5+wnsMlDfaTdg8pFv8oPch8vKVb2uja3t7tRZdU0LOX5rnpJYLQ6+W6XIipxSjF5C0WBXK7opf8LOFIc+L6IfGyHdh9qdU8vkMANzIk1Iefje8/s6YBQDYDZOpJ+Wd6zgd1sN+hCBzRrLHbOSky4pXaWp6rTGYoORPWHhpJWGjJBQ2tylYCQ3RmXD0P8omGjlIE3S4OdtCWAL821Qa0adH3FeQNNV3zWg16tfnl/z7cdBLXEY7rCnhUSRe2A0/MzZCppijI/VRylyn0WF4CZDyTsILOnztGpixI4/uwzg74WkH2BHea6krLIVrh/2soC1tflfAZJIvZM1BqwHK9QsiODgJBgTuSMQBwSKpiACU9g7wy0+hEsTOPIb2WeGRILNtymR2dg5b6rukAgoPNNtHsrsVDHIw9my2HeCfnjCodEaaDe/61tORDWttEE6VAjaVfbNbjlqzPFfk6uYh+v8m7iAbGXH1iKXgUS+roQv5shUv2EKdiwwpcVYeFCGErPR8fUyfC7ZheVFtdI9sP/1CC4Jz+f4P/oVkqmonXDncDD31ZBKoiahl6kYiYRc9WXSwg= X-MS-TrafficTypeDiagnostic: PA4PR01MB8947:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: evgcyeenJ9h+ZdI0IvibOYqSXNnVBrYMA9pEDEfn4DRooUFJiNCibKqCo4fG9aXiyDcktdXNqVzpUN+LnUNvXsTqP/lgZ/azGlIkHcrCNC5nK8WiNfAUO608t36JzFjfcBoridfTii/4coAjOFl79XlrpJkQyEmQPqXK0ZNxGqD2IjPJYsSYdBtzOYGVkLLmeSvQC8LIqq6MyaUBL6v/l+XArnsYuIidHl6WklcIk/MVlGltUnjhPQ9eEuYCLCGJeI/gLhcNYOTz790QOZ54N8LD9XAHkyzSaZlUTlBF/ko+03/Z2yEgsFBVV5LDw4WhP5fAKlb+xCHBweYWEMbBt+hNj9Ws5Ogj08BmrrxYxyVvQbPf76R9ezriN9EJA5p+CqWuqIf0XLiIEGq6GZbK2p2vo6UHSRIyuvLj+D9qI036fltloSB0imG5mXe/MwipHlRtXcai7GfO91A4ICWpvpect40IyUqcvTGSlRm1HprZJUUHx7JhF+y89dpEZ4ECwSYALhNRqYtXyk80fLBkxhuOBfElwXejH6BteYr9J6Hx5QS2O8906gsawk0P1it/t3oOrxqZJir9KZaWvnQpLg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z6YUxoBTCVywQiUamiZV2yv1GiFLfcvV5jJMPAgmrg8CmphHru9ma8c2ryz3WGRuzrP3iKXvAcE9csI4/0BcpdDgZqbQcTDk0uF/Ed3G9lNwkjH3P6ze8X9zg2kcYU01QHK6Yr/6XyXQQDFFxSFExj0rj2B3DrZ9eQ+c1mBjFrVo+yUDH/Qsua8/Z6wh1xY0pd0c1PVyCVaouytl363lI0crKpn0ZcP/BEq55R0nzy5afLNEHcLVo2w9Iz4NcXzyePzZ+vXpkhAoO9TDvrDLJpuEdXudVbpOPhox+e1sNgqw8GjctEWk1urCZBITBLg82sOrAuFf11H318ylXd/KwofNrko+yefIcMkLHc0oDP7aCHGnA7cC7jMQiYTohFoWDyQHSkvzofgh/KQKgNYMJF9n4FCEoF1GFYkCYlQIW8XRQccI01UY665oLTUD1KuNwCsCfFc1kjCbfv+vfdJvdSpk94lusnmZU1e2pJtCnwBmW0HKNOBxXQmhGgswXfCfaCEgh8cgdcf9NJr1K3Ybo4Ih5qy/BtealCvyedzSHgZnwDoFirWy3yDETxeyneABmry6cLThNzHCl+dvhUsuKbDEWJJwa/2IcU+2LyP6eS05rh8a/BmxYJ+w8ztuhdjzS8rVRvuP4DB5PIEPNK9fD5CPJkaLcO713aB6b+Yha24/ECx17c4AiQZxzX6y6Jn49JWDd36LDcw+ToGXAD+hMPYXsHAcvCaU4GM9FKmM0fUoE5otry88PBNHx+dey9PeGH/6aPxlsdp6gwlICmysV1pXIu8t+GEoue0oUJqduwBFFhxKy2QAI19QGeF4VH0V+1XIwsrat9notpxEJstVoUlPVsCLEWMycx0RqlOI6Lzbv6zYTDQfnTQOJ8q3DokqUzEd370+ivgddkMQDTIC1u0NtLwYSG/JJDl4WZhIapPhZOA7qO/FvpLWNjQpHKwI4szjnlGnSycQA9RXvVDrbBnnAI+8IeKAxYVrf018NdATUDsQoxW2bWHLgLsOvEyguw22HDDdqhGnL4HhEhjB6dse2aHkagK5hqyajxoIbqG1i9x2GeHu4ZVwXSFIhFfOB0bIrpsnG1KaQoU1UcQBv7zmKkbes3zf+KjQXvkHfO1GWNjN5N04PGiBKqNMV/ITQ+1nyJnzB7iRQryHidN+n/WoGWMu6csYAoZG5sPjVaA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33bfda39-0a75-48bb-271a-08da06bf5181 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 20:06:40.4150 (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: PA4PR01MB8947 Subject: [FFmpeg-devel] [PATCH 13/21] avcodec/zlib_wrapper: Use our allocation, freeing functions 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: JbjH894HA12Q Signed-off-by: Andreas Rheinhardt --- libavcodec/zlib_wrapper.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/zlib_wrapper.c b/libavcodec/zlib_wrapper.c index b15d5be2b8..5b93c2c74f 100644 --- a/libavcodec/zlib_wrapper.c +++ b/libavcodec/zlib_wrapper.c @@ -23,8 +23,19 @@ #include "libavutil/error.h" #include "libavutil/log.h" +#include "libavutil/mem.h" #include "zlib_wrapper.h" +static void *alloc_wrapper(void *opaque, uInt items, uInt size) +{ + return av_malloc_array(items, size); +} + +static void free_wrapper(void *opaque, void *ptr) +{ + av_free(ptr); +} + int ff_inflate_init(FFZStream *z, void *logctx) { z_stream *const zstream = &z->zstream; @@ -33,8 +44,8 @@ int ff_inflate_init(FFZStream *z, void *logctx) z->inited = 0; zstream->next_in = Z_NULL; zstream->avail_in = 0; - zstream->zalloc = Z_NULL; - zstream->zfree = Z_NULL; + zstream->zalloc = alloc_wrapper; + zstream->zfree = free_wrapper; zstream->opaque = Z_NULL; zret = inflateInit(zstream);