From patchwork Tue Jun 2 15:26:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20120 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 7C4D0449383 for ; Tue, 2 Jun 2020 18:28:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6161D68B2D1; Tue, 2 Jun 2020 18:28:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9319E68B0B8 for ; Tue, 2 Jun 2020 18:28:52 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id m2so1626850pjv.2 for ; Tue, 02 Jun 2020 08:28:52 -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=pahr5IZGRUcTOQGwaysrp6HqshjGmgqjaMOfJczWHe8=; b=b+HAfPPVr5TJmx7FKsxT+mL6yKGt1fzwZdHVlqpzwkG94TMPN+tlbjAErj3OCrw8Xr iCrAQrC6YIIzmL8KBjhENutaE5bmYAN+y0p+g8YsUZuB+VlnM3Gb2j0narzqIvs/63F7 uOPt/Kf30uBTsGVvFwsIlr0xRf83kKvXBqml73jGXo7gIb/9qK/61xrRSCRxS7yqAMY7 t1+3TBgfTFflSkRKfRbRZ/wyK7iazZBpJTuu7z+qnoUOIiJtu3a2qrf36P2oMTXeXfWK Dh7oVvbPhudIIXNVgswqgrr1Spb76OsOrAym0dPFYBVhZuk4gqmW5Xv5cE7LBVJaYL2k KMCQ== 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=pahr5IZGRUcTOQGwaysrp6HqshjGmgqjaMOfJczWHe8=; b=ch0U3WKUlZQoU9nKEfZzWIGsX2TtK/M1jengmhxLmqxalEhVn3qmxHNrrtLrV+ViAN opsrTu1gdz9S8iB5FlGz17te9AeHv3XmNH3+pVRx22xxFjF1sZlv5YENnm/dmRsxv+0+ 7r0rC687Vkwqs+wq1u5dFQNLumdi7FEv38JeZ+TG5cD3GQcrFB3i4gEMgmkxAtYcylVQ L1AIBZPnuLkvlpRvlvmZ/seAWBOt7WQvRKbb9lGzj2QxadWHs934UAZPPOnCTSkYdivq SFknUHQwS4y3k6ysH8wxFdyXeTes3PqpJZGhRkcg0SbbzXbU3BiSYvQhlZo1QSxF+GTp TUow== X-Gm-Message-State: AOAM532AYSG+GEpggW1hmdMkeYYw/eYBXx+EZClkhAZYy6d6RQPg1LXg Qbj/bPBUWXrMePCzLpl2tyENDci6 X-Google-Smtp-Source: ABdhPJyM7fWfeloxA0DB/k6+3/tbK96PlYDaxjV8hBaP8IAr1CbBpSa38nugO/AmZNUaGTriOD92Tg== X-Received: by 2002:a17:90a:6b08:: with SMTP id v8mr6488804pjj.162.1591111730742; Tue, 02 Jun 2020 08:28:50 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:50 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:52 +0800 Message-Id: <1591111618-15778-18-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 18/24] avcodec/mpegvideo: simplify check for av_frame_alloc 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/mpegvideo.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 34dfda5..58fc850 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -941,17 +941,10 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (!s->picture[i].f) goto fail_nomem; } - s->next_picture.f = av_frame_alloc(); - if (!s->next_picture.f) - goto fail_nomem; - s->last_picture.f = av_frame_alloc(); - if (!s->last_picture.f) - goto fail_nomem; - s->current_picture.f = av_frame_alloc(); - if (!s->current_picture.f) - goto fail_nomem; - s->new_picture.f = av_frame_alloc(); - if (!s->new_picture.f) + if (!(s->next_picture.f = av_frame_alloc()) || + !(s->last_picture.f = av_frame_alloc()) || + !(s->current_picture.f = av_frame_alloc()) || + !(s->new_picture.f = av_frame_alloc())) goto fail_nomem; if ((ret = init_context_frame(s)))