From patchwork Thu Apr 30 13:39:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19402 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 6BFB044A95F for ; Thu, 30 Apr 2020 16:39:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F21568C752; Thu, 30 Apr 2020 16:39:51 +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 C4F3E68C3C1 for ; Thu, 30 Apr 2020 16:39:44 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id h11so2242540plr.11 for ; Thu, 30 Apr 2020 06:39:44 -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=PdGC4rMwLfrgNbwpdzYsC64oeJbVPQiKIBthCMaINvo=; b=mu2+fC+45ec3a7liyiQTbkgUdNyz1XmoOjrfS09TxhRSHt+eB11oDCLMmu4E3eUv8Y v8TnroolL2I0azhd35Sp3++zJM9bYcQWMUsaPLxWRAnxTBRN6qxWtPrZW1xDaFBMreNE w8BZQsNjqmTEToNAN6R7Ct9ma9rwxNp+9A31doGj0Mc8j0unumdBaPNsm3UjoHsAes3K p8vsp16CGhjhHTn2nC8/xlUu0TEt+6fSD4JIWoKwcfygjYwJkZ+A+9yyZCfUWvtUSmRE tIjIXQNq3wKKKjavQZjNqeTDblM+G8KvsU6xOtygXbn2aKB8REP/sHmYkCd9iFw+/076 aqbg== 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=PdGC4rMwLfrgNbwpdzYsC64oeJbVPQiKIBthCMaINvo=; b=mkg480gEHnCOazMIZoYd0BZXwS+eBTasth21i3m5UtWYIzm3iSNP5cxUEESr8gx6i2 NEnoGUHbVCPnwcMt5rEmKCEsP69Co9IwY61tfSzq24GYmM7Kv1QIgf1IdkOnu4mXrt+I duh3wgjOcyUhMTInNznEsAe2x7vVFbgyB3O9Wj1G9oqhVCPdcnfvFZjqXHIgLqBsv9oX aFJ+qvwwyBgm8v5DiDtSwatTrWF0gzidmzIWsYHZDgYa1kO2XN8RYGI2+Razl8K8xSiZ mcJCbDM/7mOKseYrjO/DjIkNqDIEwW1fGJPt5fveFN0a37CgNpynET1N/r1BPovdGAxN GNRg== X-Gm-Message-State: AGi0PuY8/HyVlCXRDus6m3mdivhHDxyekw/MYWxWF8bHrMaSC4dUqiTC hr2qevC+ocoqWTlY7Mh/np0D4sog X-Google-Smtp-Source: APiQypKMGgVSHPmD6JdgRITCkakhYbKQ5lJNb04B2FW4Y+hc9YGcXJjVDM3MgcDW+LM621fdXbhxJA== X-Received: by 2002:a17:902:9697:: with SMTP id n23mr3793860plp.150.1588253982799; Thu, 30 Apr 2020 06:39:42 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 14sm3648480pfy.38.2020.04.30.06.39.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 06:39:42 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 21:39:36 +0800 Message-Id: <1588253976-7043-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588251554-3665-5-git-send-email-lance.lmwang@gmail.com> References: <1588251554-3665-5-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 5/5] avcodec/utils: simplify, remove duplicate code 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/utils.c | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e77090d..3ae23fc 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -583,38 +583,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } avctx->internal = avci; - avci->to_free = av_frame_alloc(); - if (!avci->to_free) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - - avci->compat_decode_frame = av_frame_alloc(); - if (!avci->compat_decode_frame) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - - avci->buffer_frame = av_frame_alloc(); - if (!avci->buffer_frame) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - - avci->buffer_pkt = av_packet_alloc(); - if (!avci->buffer_pkt) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - - avci->ds.in_pkt = av_packet_alloc(); - if (!avci->ds.in_pkt) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - - avci->last_pkt_props = av_packet_alloc(); - if (!avci->last_pkt_props) { + if (!(avci->to_free = av_frame_alloc()) || + !(avci->compat_decode_frame = av_frame_alloc()) || + !(avci->buffer_frame = av_frame_alloc()) || + !(avci->buffer_pkt = av_packet_alloc()) || + !(avci->ds.in_pkt = av_packet_alloc()) || + !(avci->last_pkt_props = av_packet_alloc())) { ret = AVERROR(ENOMEM); goto free_and_end; }