From patchwork Wed Sep 15 00:57:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30252 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp5489761iov; Tue, 14 Sep 2021 17:58:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwa0nFERlaacMkRfi3I/Q92eKQS/orUTcEnzdMdOhAbwSbbj0dm83PX2UV0pnN93Qb/YP48 X-Received: by 2002:a50:ff0a:: with SMTP id a10mr22840135edu.273.1631667505221; Tue, 14 Sep 2021 17:58:25 -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 qw5si1198637ejc.383.2021.09.14.17.58.24; Tue, 14 Sep 2021 17:58:25 -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=MdrTVl6q; 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 A275068AFA4; Wed, 15 Sep 2021 03:58:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072084.outbound.protection.outlook.com [40.92.72.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AAFC068AF76 for ; Wed, 15 Sep 2021 03:58:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=avCyZyzZh7YSnH8/TXTC1zdfBKYk3ExT6Hwbcud7XVkzyDpS9AFQY5LSM4KLuaQscAJmQhTM7/WgojO+s5GaMvSLcE94qyFD0COvzFhbHeBl/WnsCO+kSwYwr7MnM08i+c7H1Sq0+IONMLV2+QBRmlsbOZyAS+Dt5GTZfiuJD8fW8G/61bjyO/2lF6V08oXyBwJSFrhx3Ai1eQPINK+IOK/cDyEqHm9E0YyNnG8SGtb0QnW6ZfYfe/VM9nzqwq+iPgEilUKytsuHcG5Wj/B522Om+y5N/0n1Vi40JJqpTX6Hf8I7ch5lBTXfbO+GGP2cby0jxdLhRd1myGj4Axt1gQ== 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; bh=zd3wcLFxfhgwiNI2Nb2fhWXvIakpWQqemYXs5fnylDs=; b=eaq3vaHCLsNAHS6rAjO4cCZbwAkLKSDMu0LMPul72lRa+Yr/npOHqxoDIq9g6Mhu0Ptc7CB9MR5Tnj+PydLSnBG5YwfBunn95bqAAfDTOYJnFxICGOy/bfNw24kwl5vOtRVxk9o/qDDLWt9xARppKF1CdRWTabDEdxYNy5atoj7PwjeMrWHjoVX5pdBq/PEGVOulD0BJb4/cqTk2TKZM1VuXFs90E3FyDyo4jEt1IrjufXFXwZ8DT1EozX3TufrinsMVpTJ+zgjkcGi3Eh/aCBmRjjoDgXYIptIzoD9GzxmHy/TZIeXUxpPv6dyogQjAhiUuHQiSjJ+QztlkkOUmRQ== 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=zd3wcLFxfhgwiNI2Nb2fhWXvIakpWQqemYXs5fnylDs=; b=MdrTVl6qUTHHYItHqmaRHAQYwhc8mvc+8WWVOr9WDeL7tmO3wP2bHkz6ycLB7XS1RIfp/zcd7xM8whsCvjJc4/3I1M6btB6ck6sPlWI+jppn8ojdzMRw26gdZToYUU4WUYWvW16YURVO3WWU9KhqIJyd+7xcDMuCHd+bAxEX24lsI5fe8Yzz+wbYp94dMIHNGDIj4/PNpXi3Bh5Pjy3n5htZ0hU6NsxSz0010RA5lI9PLlAZrwvm4VbsoXVN90CdGq5t7wwX/qFCdJA+Cco9OT1IMeoUzpU0lZvBrc1MCEegVzoAqvYP0xcK7nKKkDeXNrR+t7+1PTSKS28vxouaLg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6354.eurprd03.prod.outlook.com (2603:10a6:20b:1b0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Wed, 15 Sep 2021 00:58:13 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.019; Wed, 15 Sep 2021 00:58:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Sep 2021 02:57:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [q8nl/TD2OmNoLqrzqBHALQQsvGuAgZgN] X-ClientProxiedBy: FR0P281CA0066.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::12) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210915005745.3770937-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR0P281CA0066.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Wed, 15 Sep 2021 00:58:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 444ba36f-67f2-4042-90f4-08d977e3e51c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUyNnkJffBoITXmWqz3XZegdfmrS+ibArCu7CUSaSb4kHp3N4z1j8xEPeNODleeCr9rZqxu2baEnPVirKwV62VfXnQ1QeamPcgKncJ/nA1pPqL3bL/Z+fXU3Udyh2k5og24PXw356CmUXgQ7hnmFfcuXI0H8ZoWgbvwdOFRUaEuN1+brf/v9aKPr0Ct0ijkLA7/mrFJKQ1Cr4IZl1ZRgRz8yXKQcVABItJVXYAzCn9QaZBm0Ee7PL6vM5T5mLsCDp6TLYgeYSPjvfB6CPkYyjvNVigLkw4H5F9EzCO/nwmOE6skRNHo7GlH2lNO95XUebxtZqRnnCRXf82aqzjKLakx13SU+210pOIVWg67zqvpVSu1haKJM8N3Bplz6DWr4vOGLCeT8pC8WeYw4B/c3Ey6o6A4KoPPjVUh04xXIvik6vwyMXamITrA8tV1MV1V2EZMw7bDqDAU3cRSoD9s0Ks7lR/f6Kr63kAdA/c1Xc0Jjmlrs/bKTdO4UDAB52Egoo1MIzFC68Io+5HADgegdqg76AEtYEqXklzGPd8/GIGBw78ImWFV8TVi4n6YMwvcxqdqavvHoPEFareJzptYyWBQcO+otckf5aukzI0UbPU5S9Veg/XC5rLj/pLeOsk/nw11JWVPY1V9UQ7nkwMRzgqrmwoMbSuive3mPIveMJF++jVMfg3pfe7qZruJh6U19FUESM7+ddL2IlP1HKY6fBTw2fnu+FTmS2w= X-MS-TrafficTypeDiagnostic: AM7PR03MB6354: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yzLTQG2/7QRO9R88Rl127xfeWf17Xv9jjKc/RSDfnWC6EGTeIni0JVfD+GOS2aVS3T9rsQX8/kwOdUXHIGD0EEX5bMGg620oBMyBTR5w5m6Tr0wN5/DwJ7+m7/GOymihh4TdOtMqkuUBiDUCVr9fN6DVkVvETGqzN9JM41t0xi6nJpybR4uJ+DgTEXzH/IuTQKuTnUU8uQKh2/fttYo8u0K2ZIIHD8c6bIiR2gSbG1XNfnRBRgcK4taPsSpP3BBtt35GQ7SABhBwJPaXkkSMxMjCdxl0/O8G8+nj+OhrbfS1wvQ/jsesej/p34sb0kuAZpXM3L/TyWlfXGhfb8VmKq9NzNrXIWxhVdrc+ryOGPRrqIIUkn3HhD09L3TuqK209e4w54GT1PtkSH4oRWwLjaXaajlKhvrLCmEbuFn80ANCB1EcZhZZEi91AQ4SjkNg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mlDdhMMJfdXLSNirKN+lV6hSZaOBONKrkTHwuxVbKL3h8hqFRkDne0bZNOZWdlQvhWxRfHaDeuozw1FC06vdmaIdCBFDU6KgwLod3XFo9b77BFqzzXRmiFM5Jjz/uwh3WMzHz34jtNwocvN7eu3Dlw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 444ba36f-67f2-4042-90f4-08d977e3e51c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 00:58:13.6653 (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: AM7PR03MB6354 Subject: [FFmpeg-devel] [PATCH 12/12] avutil/mem: Deprecate av_mallocz_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: +rZZFSEmFx2Z It does the same as av_calloc(), so one of them should be removed. Given that av_calloc() has the shorter name, it is retained. Signed-off-by: Andreas Rheinhardt --- libavutil/mem.c | 2 ++ libavutil/mem.h | 11 ++++++----- libavutil/version.h | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index dcc75945d4..194d880587 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -211,6 +211,7 @@ void *av_malloc_array(size_t nmemb, size_t size) return av_malloc(result); } +#if FF_API_AV_MALLOCZ_ARRAY void *av_mallocz_array(size_t nmemb, size_t size) { size_t result; @@ -218,6 +219,7 @@ void *av_mallocz_array(size_t nmemb, size_t size) return NULL; return av_mallocz(result); } +#endif void *av_realloc_array(void *ptr, size_t nmemb, size_t size) { diff --git a/libavutil/mem.h b/libavutil/mem.h index c7f8867a13..b9fe80738c 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -237,14 +237,15 @@ av_alloc_size(1, 2) void *av_malloc_array(size_t nmemb, size_t size); * @see av_mallocz() * @see av_malloc_array() */ -av_alloc_size(1, 2) void *av_mallocz_array(size_t nmemb, size_t size); +void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2); +#if FF_API_AV_MALLOCZ_ARRAY /** - * Equivalent of av_mallocz_array(). - * - * Created for symmetry with the calloc() C function. + * @deprecated use av_calloc() */ -void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib; +attribute_deprecated +void *av_mallocz_array(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2); +#endif /** * Allocate, reallocate, or free a block of memory. diff --git a/libavutil/version.h b/libavutil/version.h index f220e192c8..3261f1eea6 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -114,6 +114,9 @@ #ifndef FF_API_COLORSPACE_NAME #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #endif +#ifndef FF_API_AV_MALLOCZ_ARRAY +#define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) +#endif /** * @}