From patchwork Mon May 24 12:49:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27936 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2952536iof; Mon, 24 May 2021 06:20:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUFwxmVOp6dvVUUnRMc/PS3FtEdt0yQkRP9h0zn/gHeo5ArsdERTUoKTCkubuecGdu1EOr X-Received: by 2002:a17:906:4ece:: with SMTP id i14mr22614744ejv.249.1621862411388; Mon, 24 May 2021 06:20:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621862411; cv=none; d=google.com; s=arc-20160816; b=XlXS1GwOXbpoqkOJQmDDOHW7u4qMoraUHYRehL0ZnmOg6GnA0NrUx7kXiXII+hkLNJ w0gDnSaUCcTIdfb2WbL+z5Sqr2nstcVYer4cnnV7AiSwpqigLvZu6449k22jCskVbmhf TYEGCb0vkY8wIu+3Mf7NuzPNbmDBoD7/My6EERK60/kaVa60VzhByz/ofKbJ6W6UgutG nDJMYlv5q8OHLXLMUH4saGsS9SYGHAIbJY2zxu5ZLzGwKgUacLr6F7w0YhULXPgXXGM1 w4OHemlbMMokyJpHOJXpq1dHkdDhUOjIN7eTvSNIZvg/OBSV2DnPO97FgJHEpkWpxb1F qj2g== 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=BiK2hpPeuEgi1BThIZPoLiU90A/fmtaqdn2TmyoV9lM=; b=li2Wr+eTgO31ZFYXapTRNuNoZhMlWqbL9cqE0pPFrf0uN7sUw/Nr9ZPs/Tn5tBnKqA y6Cz1W4ayRQ4oxMaCBApnLJRHhJBilzQU2630OEZ92EAdPlfXF9K3s+tpYQ7gflHOTWA xbbQVTuW05cbUBzgR4f2J/yGa9Nx8DjRm4oKZ9KPcS6d0m2o/HRBtJ04cO7l09mZG2t+ JdEAAN02oUm7HmK7p38YeOG20Ap5Aw9CPDR+7jbFUpgZgB6M2HGsGC+GpS3CuHZXVi0K 6535f0xmy4xJ6cLyAfT0XKFFTxfYzpzZlXeliBCntNlOZ9dtE2uivF3OGMqyE1JVXDtx XukQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OzzRzwm7; 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 q13si12193647edw.142.2021.05.24.06.20.10; Mon, 24 May 2021 06:20:11 -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=@gmail.com header.s=20161025 header.b=OzzRzwm7; 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 37DCB689806; Mon, 24 May 2021 16:20:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f46.google.com (mail-vs1-f46.google.com [209.85.217.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEE536806FE for ; Mon, 24 May 2021 16:20:00 +0300 (EEST) Received: by mail-vs1-f46.google.com with SMTP id f11so14226173vst.0 for ; Mon, 24 May 2021 06:20:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EEiwaCk4D5B7CtJyVhMFFycxm3gutvwGpKUWBtIrDJE=; b=OzzRzwm7vCvwYLv6lAtxghPczs5dNCeoACmtxmro6U8CvN/aLY1jPj28XKT9ehUq1M ILghNnsgXY4NNYi5rUTfQMWcFOwohZmbStXIP7zLkepgf8hQS8Iid6CJcHApviXYRhuF 7Wl3tgt+xSpTW0D1uh97Cz88S3KSf+8D/IIGEO/GO1ASMxZRdiSNPho7S18PZelkosTz qgdnOaXO67CSpm4/QPWvlNhVxyeKTsz27k5wHO2IbN+v76GFNV1lMwotcHpftJjAhSMb LG4uWanjE6eBNei8rpGafYPKJdaGpgh4coeo1tQOLik2UVN9bmc8JBM94IvYfhNMwEPi d+rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EEiwaCk4D5B7CtJyVhMFFycxm3gutvwGpKUWBtIrDJE=; b=uf7dr+XRcUycSx+A4UJTqS3xDdxNcanAsouQTZ1cXz8s0/E0YhfSghN35vwozK5y9a uR0s0dzt+L7S3+hKFEDQmRHh6npxVzOzDORV4yZq5BgcueS97E54ugR/MWBpf1aEVMh0 pW75VfAjNhvTvAA27lgzhLwB0jbGuNTMbLG3lGNT62RLLUKvTVHjMCFmBtnYJYu9zoPG 693F01IzT1draPHt6gJyBOJOaZ6U0OZlaNkmgwyzefvIeuwuLZHKTDyAymMFFS5a88R3 p4ggX+OUInzbShZhIGBPLsrpkrHVy6Xnth8+z9gTfUtk/Rta6QNJrZNneJ89XVLCJxmu fkSg== X-Gm-Message-State: AOAM532eV5JKAGXZTP3PdiYK4c3mPADba7883HALwczEbdgT+q8/whCt OvBByu4pe7DOAKAMY83qylsi5v2Da8Y= X-Received: by 2002:a0c:9e0f:: with SMTP id p15mr30803680qve.33.1621860600691; Mon, 24 May 2021 05:50:00 -0700 (PDT) Received: from localhost.localdomain ([191.83.214.167]) by smtp.gmail.com with ESMTPSA id u26sm10220778qtf.24.2021.05.24.05.49.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 05:50:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 May 2021 09:49:17 -0300 Message-Id: <20210524124917.2907-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3 v2] avcodec/utils: don't use ff_fast_mallocz in av_fast_padded_malloc() 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: Yk4uQ4rqZTHD It will be removed in the next commit. Signed-off-by: James Almer --- libavcodec/utils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c08f9a7da3..cc6796d8b6 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -29,7 +29,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem_internal.h" +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" #include "libavutil/pixfmt.h" @@ -55,7 +55,8 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) *size = 0; return; } - if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) + av_fast_mallocz(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (*p) memset(*p + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); } @@ -67,7 +68,8 @@ void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size) *size = 0; return; } - if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) + av_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (*p) memset(*p, 0, min_size + AV_INPUT_BUFFER_PADDING_SIZE); }