From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id C34AF45284
	for <ffmpegdev@gitmailbox.com>; Mon, 16 Jan 2023 13:42:31 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB44768BE4A;
	Mon, 16 Jan 2023 15:39:39 +0200 (EET)
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 <ffmpeg-devel@ffmpeg.org>; Mon, 16 Jan 2023 15:39:34 +0200 (EET)
Received: by mail-ot1-f44.google.com with SMTP id
 cm26-20020a056830651a00b00684e5c0108dso2377742otb.9
 for <ffmpeg-devel@ffmpeg.org>; 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-Google-Smtp-Source: AMrXdXtiqSuPK3396fLxd+o3HkowNR68PSVa0KGkOtDdXqS4IHkF0Av4QtHqwpBcp6/bkB/08aIHgA==
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 <ffmpeg-devel@ffmpeg.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 16 Jan 2023 05:39:33 -0800 (PST)
From: James Almer <jamrial@gmail.com>
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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20230116133840.512-23-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

Signed-off-by: James Almer <jamrial@gmail.com>
---
 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)
-- 
2.39.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".