From patchwork Thu Apr 30 13:56:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19403 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 509E94495D4 for ; Thu, 30 Apr 2020 16:56:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D91568C76B; Thu, 30 Apr 2020 16:56:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E269668C6A0 for ; Thu, 30 Apr 2020 16:56:30 +0300 (EEST) Received: by mail-pj1-f65.google.com with SMTP id a32so724491pje.5 for ; Thu, 30 Apr 2020 06:56: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=amvne7C3Pc4RYuYAXdc8va9vBdQGMB5iH7wbQ8xqPpo=; b=lJTxXcK65GOzt1zZ2X5eexK60bh2qnXHiUcEGz1m6QLulmCM84DBya+1lZqW96UAG3 d0FI4WurdHi0tDGlGeuouRsJJcPA87dCJ/qSCgBx4/l2nA6dgQhF+bZ7VOLfQQ9vwLqs cXjcZdUEs5IgB+IR7H6q7wsW6iqlk8ymjAMeJuCOOM6h+rHM/Xh4+Lb8Jy8Ga2lT1paY hMFbdlChOlTH2DthHUMcnrIdDVf6hs/twDCPscZm+rQd7G48/wVSJtHe6jHxVj0n3qm0 uS5YFPIKAXSrjzxJapzHLhBMjcxYBoNE1Rgk+7Rq3bUhpiSAIcBVisYlSkBrGQS+JktY 0niw== 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=amvne7C3Pc4RYuYAXdc8va9vBdQGMB5iH7wbQ8xqPpo=; b=kfg/IxAohz/NADZleVe5cOsFMsHxOcXEHg0BCEbMQgIeZGR5P5RNwCdd3t8r006fgo kmtR6oBD6K9yRu5G9cYrJlscomb7dxlMxe8O0mWuzypi1lcEk/srjzuLDCn0NlHn4mGS vWHc8pRJFEFppAXUf7wUPVlxbY/ODEdNjfu2G3lGctZNBeWSoh1nbazkETawNubCLJzx 6J99gtzPSd9dn7XJ6fi1BolNmzA4ykqKM7ftgmXyL8lpLkpQX05bR0rJD/kyB9GPugqQ yZjUKUVC7nqSgpKjQ2aA8DvGB0ix1BsSVsJQSk/TjoZax6lSwOmwBVewYxGhx3Lfbb2D tx6g== X-Gm-Message-State: AGi0Puav0DR4N9Pj7xTjxOvT9/LfrqAKqDT3lv4PQLdEKLczWFdWBhwq cVi5SoWqolO1WjsIb+T50WNFA9cG X-Google-Smtp-Source: APiQypK6ESSqTBQCjcTO063jvkdRJ0LnGSvVKo6b5zbSKqc5PcMM0UNm8jWko/jI8K0iLnVcPp9OfA== X-Received: by 2002:a17:90a:e389:: with SMTP id b9mr3008122pjz.141.1588254988799; Thu, 30 Apr 2020 06:56:28 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b9sm19537pfp.12.2020.04.30.06.56.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 06:56:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 21:56:21 +0800 Message-Id: <1588254981-7627-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 v3 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..1a8ca16 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; }