From patchwork Mon Jan 16 13:38:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1038870pzb; Mon, 16 Jan 2023 05:42:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXsCySL2rWaxHVHjRporaN7gAgHjly4YUyMILcHAFlhK3gLqxaJVsFUFppapF7oXfdZtbPhn X-Received: by 2002:aa7:c716:0:b0:479:8313:3008 with SMTP id i22-20020aa7c716000000b0047983133008mr9615851edq.0.1673876555667; Mon, 16 Jan 2023 05:42:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876555; cv=none; d=google.com; s=arc-20160816; b=fUhkErOyF0hgpyQ90q6VzOFScyfXys0WX7LKxzX+AQ2QXaGPV2g/hq9vVLjaNtAHrp PNwu7OhgMTyF5kt6UwiCD72ooDaJhV/0NgZZFTe9eFbZglGSFKpBIPKlhhQUyqdc+Zkv 8RdDzBekLWe4I6G3nWql/sA5cY1t3PEDCsrCwPKE3VH5SAT+kWem76sBdUjOqMlL+zl+ 2Tl1UYoYJhuBnVHXi5tJMRD7W505yu737+HcyfhAgIHE4Fwc/VeBeozK2zGvMJD4zELL QGpIekWslDZFJ27DlOo2PTa1XqbiuJiSC9aO2xMdl2psKW7kNesgsA/Wo1y42OOUkuLM 0yuQ== 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:dkim-signature:delivered-to; bh=SdlMxvCM8Mo4pejbqExoj3MJj7v/41GcoYjka9iVtkc=; b=QHs9A6en+DDciAXorYoXb/T7OurJATTeb7szAPQAK554H5UvEwBWVxdB2QKvGcpRiy 3GX77acwxkKgdfzukMhWFzXQYyL9GyAWwPdC/HX/Lz19TYhMyBJ+VYZP7t39pbXndUbF hFo8KC0Uugd+5sivmOmwvgEmkxhTnRlY1EIcwBcVsIO2rBBGNiw0lZN81s2CbhDd50HR P5XfY9UH3BRt/0SCfn7ZebJbRMASrIC2BT4u4jLPm51q1kHoAUaoS6qTGNMG20wGHqIW WAS/w5JGJnyce0YN5UiNES6C3UpAKm3a7Kg8z1dNhKCl6NWdjfHxZnbTxVJp1ITO9nGE hCWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ncfyhuOZ; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e16-20020a056402191000b0049d11b2a297si8458412edz.598.2023.01.16.05.42.33; Mon, 16 Jan 2023 05:42:35 -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=@gmail.com header.s=20210112 header.b=ncfyhuOZ; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1925E68BE29; Mon, 16 Jan 2023 15:39:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15FD068BE10 for ; Mon, 16 Jan 2023 15:39:34 +0200 (EET) Received: by mail-ot1-f44.google.com with SMTP id cm26-20020a056830651a00b00684e5c0108dso2377742otb.9 for ; Mon, 16 Jan 2023 05:39:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0AeiIrqQ9QuwteFA5CWaXZz+4RiLIl9SY8M/N5wGjr0=; b=ncfyhuOZo22CoCJZ82UG7TAUsAA0xxKlSj9isQyKoFmIppzifBMoruPIzWqHey1u2d lv2REKram8GCKefO52t4E7y8UzYybDdFInE+45yZNkbE/KfP3EY2sr/neI9E6nNn+S9p /z6cH51d71VuLGOE6nvei4pEhvd9+pdof36VPgje8a4LuJUIGjuhi0+l16931WuhBEDw HjlmyfryqtBzFHVl2rf0WkBP+jTWppj+PlPrxGfx8hkzXth4M2YAb+lthSKreDfAr2s/ uQ6Inj0xLDtbBODTATVoXYfLQ0wXp8muX3ExUi6cM6S7twSqVJhtpiP53YsAklFcJiUb mxRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0AeiIrqQ9QuwteFA5CWaXZz+4RiLIl9SY8M/N5wGjr0=; b=0jvfNIUMcma/wNUCeOdGWPxX1YQRlo/jPOc1P9uEcaL44F0tzLIyegMO5DcPw2/JCU o0wHw+nXB4N6beOfxl6o4I79UPcCmM95xn7PL3H+hRpYOxA0ZDhAgryt+QsuJAoc4fFW o+olDfV0XgDDZihkrqXaOJPCBkKAZhUwWppmNe1XvV1yCYPFcPuEQpi6IfWnRH2iPy+l utC1fXXdLJLeHLSLjFr7JZ6qu/KSKLpBZbyiDcdq60i3WKIx9tuVcnIISWDk3ImEQvVN ioPkOuQTC1hvdzD9GZCANbbABdqb3zi95zYfP+O74hTRFLC0npp8XVVQx70bQf/gOqTD 2KOw== X-Gm-Message-State: AFqh2kqfYRXGzwSTMSNoJwOcq3SnIVggVdQ3sFdGnxYwHyDKkTlIsEYX 0GN3luH0EHq+iQaAUIIy/V/BSHBvNd4= X-Received: by 2002:a05:6830:e:b0:66e:c863:ea94 with SMTP id c14-20020a056830000e00b0066ec863ea94mr43970982otp.27.1673876373379; Mon, 16 Jan 2023 05:39:33 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 3-20020a9d0303000000b0066ca9001e68sm388524otv.5.2023.01.16.05.39.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:36 -0300 Message-Id: <20230116133840.512-23-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/26] 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: l5VMrUwU5nf1 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 18aff5291f..36b8940a0c 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 b093b3b5cb..62b4ca6e50 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 700af5d874..3bad472227 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)