From patchwork Tue Jun 2 15:26:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20113 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 70CD7449383 for ; Tue, 2 Jun 2020 18:28:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A9F568B1B1; Tue, 2 Jun 2020 18:28:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8385F68B172 for ; Tue, 2 Jun 2020 18:28:30 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id t7so1490332plr.0 for ; Tue, 02 Jun 2020 08:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IH4pvrhBwmDBi3mEYtehooU70kc58MEQ7MQ8L+BNNUk=; b=DwAgDZ0jLl+UwYSofNZw61JIrs+cD0cfT2oiV9/tzK6TulNDMfYm2sizjeaeVXc06C iCzRJ+TzGGEEL0IhUfmTDf8F8ZW3tglh4sE9DNLgBkOkZd3x5YOpzudBC9uzPHZvyfKZ 70GibVzbtfPCUMJRP+ZOtLkNDyVUy/9YZTyA37NCN9OTzDkcyO6uhDnN7IDOtCNZFzBf gbnHx0Cy8az7mYZdLSnJe4hcRO2E6QjQFZ6SeEBTJIm6trWh8PwkSvOXrGYPBDSMdvFx X3D9Z43xInthKZe2QUleUNfZYe6uhNNHvk0sQtBhEYxWp/aeZpAVjyqbzdoQxfXbfttI QMeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IH4pvrhBwmDBi3mEYtehooU70kc58MEQ7MQ8L+BNNUk=; b=r1vAhePZtiC86NcKRauC2D2/EKXHanGXdhI+00m4aMtbG3HOADlWHSld0/0KwZrdz7 9H/CIkz8xWgVBmRZ+vyWeMUyP6+CzYUKMGS0MFqtxr1ZqRrbi8HotSpg+TV5goOXI0D9 xGCtFc2OdNQ93jl+LC5cfcZoJnmg6TNXeFue7w1+MRmN/2ZCMEnabGncKVnGKKKyCF5X dJ4YynxbucWD6TKUs23Ib1Mgx/x5p+xOXjUnXwM1qfKizVGx9pWGFKNuqSDqDKbdPdEQ +QllviBsiEd05GhAR8Uy3bn176G7lRx1negAli+KcgBnnXSkIyc3xR04LjZLxvvMLzlq R8fw== X-Gm-Message-State: AOAM530EfKPbkqFwbrFh37Hl8s+D0wCohw9Au2yIATayqlJJgYQKjQBo NWZb/Fd75jDVCnQFaf2/JsHB4BSy X-Google-Smtp-Source: ABdhPJxFg1ufR4DyhXtRjkDhne+yiDcIv02ROxwTLfVfQ1CGQHvwcwSP+E5h+6FPBmziXz6zF7vSug== X-Received: by 2002:a17:90a:10c1:: with SMTP id b1mr6097246pje.232.1591111708644; Tue, 02 Jun 2020 08:28:28 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:44 +0800 Message-Id: <1591111618-15778-10-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 10/24] avcodec/apedec: remove FF_ALLOC_OR_GOTO and gotos lable X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/apedec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 0bee9d8..a817673 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -262,9 +262,8 @@ static av_cold int ape_decode_init(AVCodecContext *avctx) for (i = 0; i < APE_FILTER_LEVELS; i++) { if (!ape_filter_orders[s->fset][i]) break; - FF_ALLOC_OR_GOTO(avctx, s->filterbuf[i], - (ape_filter_orders[s->fset][i] * 3 + HISTORY_SIZE) * 4, - filter_alloc_fail); + if (!(s->filterbuf[i] = av_malloc((ape_filter_orders[s->fset][i] * 3 + HISTORY_SIZE) * 4))) + return AVERROR(ENOMEM); } if (s->fileversion < 3860) { @@ -300,8 +299,6 @@ static av_cold int ape_decode_init(AVCodecContext *avctx) avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; return 0; -filter_alloc_fail: - return AVERROR(ENOMEM); } /**