From patchwork Wed Jul 31 22:37:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 14172 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 CEF5F449976 for ; Thu, 1 Aug 2019 01:43:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A3E926805C7; Thu, 1 Aug 2019 01:43:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4F496802C4 for ; Thu, 1 Aug 2019 01:43:32 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id n11so68202111qtl.5 for ; Wed, 31 Jul 2019 15:43:32 -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 :mime-version:content-transfer-encoding; bh=borIVqQ+GdYmcYfujZKnctWpC8jNS4Hw1Zq96VxemK0=; b=GJJRBS2gchQja5qSo4GBnod+7sgdYogRT7JHlUBZ1acxHeajkjvSza2tPB17NRHA/J E+Q360BX1ghOin53JHxs+51a6vp7jtKmck4Z7yIyfV4/a7tC4titEt3tsiS2fHZ8qT4M EU9BqdiM+rr1jaewSfu3rsvwB/YKN1wBHzerVPyP+32M0szwUrM/2Y/xWh94yjkj/n3b a1KmntitvNdvpl5O9qvPUHe2FYqSSl4oQIcmd2XyqkeSVtJmXvF/bQ0Dj1pvm4ae5llP 6Iglwu1+cJlyERWf+FcsM2YXxU6s+MvyvFWo4QwOzdbTaqE8vy2AfrVXLbI0t+ybLxD2 45sQ== 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:mime-version:content-transfer-encoding; bh=borIVqQ+GdYmcYfujZKnctWpC8jNS4Hw1Zq96VxemK0=; b=GZbH1x4Sl5ILM2f4Ynbq445xT/K872b9l6+cY4H7GZNGWlIfUOMAB4my/032MZH9lo MYfw/ZGcE33T8AiZi61owf4xuUZ+43oGa+4CkOoBwspGtQdmkWkdkdpsJeIJknm1flVu TnJKZ7K/7WlLoGI10TFrhEN9su3b1X78BELYTHgKMnPL8Y5NQ2ABNBiebabtI8SQdOJ1 ZpM6YnLZwD8zyfRNSybsYvAwDob09lHtsICAkAckWXIl2QS5mNpSY2/SoZdHRvQNp4XD moI+qxQejDxKUwXL13Aw6BEwhFgSylRl4i6mk+nfSpD9Bbkq1jE+fGaiERvjd7nNb+hD Cftw== X-Gm-Message-State: APjAAAXBbAOwW5C+iQG9DHXhuslFbWhrIIsDCuyZ5yR68A3KOxZEqf4x dywzTD5gr6B0iBsxEFVp9JUkzhLe X-Google-Smtp-Source: APXvYqyA3YcizYcPmEbtSCLA/mABMFilm8w4HxOBLbxOAUoRYDsn6KiQaNMeDXVRFQuG837ClM+V0A== X-Received: by 2002:ac8:2495:: with SMTP id s21mr87174101qts.248.1564612690049; Wed, 31 Jul 2019 15:38:10 -0700 (PDT) Received: from localhost.localdomain (ip-184-209-45-235.spfdma.spcsdns.net. [184.209.45.235]) by smtp.gmail.com with ESMTPSA id r14sm32327698qke.47.2019.07.31.15.38.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 15:38:09 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jul 2019 18:37:56 -0400 Message-Id: <20190731223756.3970-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190731223756.3970-1-andriy.gelman@gmail.com> References: <20190731223756.3970-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mpegtsenc: Remove redundant goto after malloc fail 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman --- libavformat/mpegtsenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index fc0ea225c6..1541a7a073 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -846,10 +846,8 @@ static int mpegts_init(AVFormatContext *s) ts->sdt.opaque = s; pids = av_malloc_array(s->nb_streams, sizeof(*pids)); - if (!pids) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!pids) + return AVERROR(ENOMEM); /* assign pids to each stream */ for (i = 0; i < s->nb_streams; i++) {