From patchwork Sat Feb 4 10:41:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40273 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1870543pzk; Sat, 4 Feb 2023 02:48:04 -0800 (PST) X-Google-Smtp-Source: AK7set9HogGjcXhyhN87dHsCUhXlCw0lTF5Ve4HQm1SLgAdlxj/efuP6SggKkfn3xCxGyx6KxKNE X-Received: by 2002:a17:906:948c:b0:84d:4325:7f7a with SMTP id t12-20020a170906948c00b0084d43257f7amr12042074ejx.65.1675507683939; Sat, 04 Feb 2023 02:48:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507683; cv=none; d=google.com; s=arc-20160816; b=Svg/9axAZIBdkXYYRYWwznLHGJL4Wrgpgd2pLwdJrfi1Poq88fIlKVTted+wthTQtG 6lQ5wubI0SXPMR1MrzYX/1C0avTww4mcETSB19vZfu/EFz+leB6gJc2U9RkDInKZxg+8 kaUuv3LN+ZR7VT5CwsNSwKUVYsJ1UyPsQQnhfhhk3p6jpVnZCebxyknqrFQVcpUGNeWr 0XNUz2MoRrv97BT1ldI80rEVYI7pW1D1OUFmimr4SfISurHEJvxcut4bAXOFflK+0sH9 nxl0HJOxvs+ih/mcOyda6QRxYaYHb/wBO/ZYnUMrUBzaxwBAjevLPVDnzMRj5gRVbNfc 6hCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=KZzb6z4TF15p2Ts2FuTqmZ9473KoMekmJvVHv4wE1mg=; b=UknCBHavKlkX5BT2cwlvwJr1pQANtzPdIYOlUYuJCBB/h0iHjBWMQXNzVlhtjO1zaz FQA/qEA43HJULqgVJ2kzszcYMKvBNhlu9dymuRTT7o2lqQ5QGGD9+GIyGSt9EPQ+6Vls Tvf/hOvysxA07VMXdUSO3MZHAzoO4fqdOuJLx09rBIUc/IgXkZBgi1cS08kYgEXh5eIk 6MltkqbdPeT+13Rm08GXPjSqgSW2hHK/ebHBwkD+vd6lplqgEvnX+vEk7l/WP9f/W9aD Mq/u/W3mypB+cYDwFrX/daOzOMYrapk99EJudvs11UhB+CtyrBTie5viwToq2YZxq+30 rtpw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id we12-20020a170907234c00b0088720c8fc78si5612645ejb.64.2023.02.04.02.48.03; Sat, 04 Feb 2023 02:48:03 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA53A68BF3F; Sat, 4 Feb 2023 12:44:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F152668BEB4 for ; Sat, 4 Feb 2023 12:44:19 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id C070D2404EE for ; Sat, 4 Feb 2023 11:44:19 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id KVE4UZ-wSILW for ; Sat, 4 Feb 2023 11:44:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 44C5B240D27 for ; Sat, 4 Feb 2023 11:44:07 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6228D3A0693 for ; Sat, 4 Feb 2023 11:44:06 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:41:59 +0100 Message-Id: <20230204104204.20721-29-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 28/33] avutil: remove FF_API_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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6n4CHtQwZYNc From: James Almer Signed-off-by: James Almer --- libavutil/mem.c | 10 ---------- libavutil/mem.h | 8 -------- libavutil/version.h | 1 - 3 files changed, 19 deletions(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index 18aff5291f0..36b8940a0cf 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -212,16 +212,6 @@ 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; - if (size_mult(nmemb, size, &result) < 0) - return NULL; - return av_mallocz(result); -} -#endif - void *av_realloc_array(void *ptr, size_t nmemb, size_t size) { size_t result; diff --git a/libavutil/mem.h b/libavutil/mem.h index b093b3b5cb0..62b4ca6e50e 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -159,14 +159,6 @@ av_alloc_size(1, 2) void *av_malloc_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 -/** - * @deprecated use av_calloc() - */ -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 700af5d8749..3bad472227a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 58)