From patchwork Sun Jan 2 17:22:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 33016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15539854iog; Sun, 2 Jan 2022 09:23:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwaAsxK8bnTmIWyD9xL6fPBaApf+vfy7WmsCNB2+kmxbBn0kvYV2aEU0HVSthY/0wLJbVd9 X-Received: by 2002:a17:907:7ea6:: with SMTP id qb38mr36357080ejc.595.1641144183618; Sun, 02 Jan 2022 09:23:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641144183; cv=none; d=google.com; s=arc-20160816; b=dsEgxuO/Ktf/+ZdBluvDvnXwBsRnI50LMZeSDPxBSmmIwptSGICaE04rotpvwq0FJf rNcEraL0m6k+2g3coqWf89Fv5WXQz2jLoOBtOeWpXFnPpSb6ZDW2+o7yXy5VPUhFrAc5 DbqfBOpEhCzKqsPNnPid3Dm1nMvKMtx/hnOATLzKWIta+nJN45RAbEXyQWjwANsXOPmO /jeBzLQFULLSKppTrTQ3HO9o0O7t6gcXNqb9B1Aify6O+Kf9OM9ivd46glOLkU3UBQfK SYemKCjEGCT2+kiBjZ7ZKjdh4VKOCemhzEnEiVV80cer9m/rs5eQJa//2+zg0L3PsDuo +mWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=Ifbw6bfTANrys8qbVZ/qYN/Srh7wYb9eTlYjeQz9YQc=; b=ZVkut49BWLgTO+kJaPLTdUlXW+Blr7bFEppOrxB4fOQ4cCbEvO2gdzNPtI+/L8rjMj JR8JI7Y4GlUR8GH/b+CDAsHnrlQynAf6QAiqEw3C2KzdwTBNioy85N+wyMsQe0CKE/iK pWjO4rEBK4D7VujdCZ4j7Byvh7o1P5lrqGOeGGzz/kwegMlXidjMjTYG37jVVl38mWOc QK/tzzf7+FjWS4i72ufMRhYpCtiO1j8+zTATMTx+QztcqcGqJB3nUr8B/opoYXof/t8B J8XQv6RwpQgWl7W5rPvv0dAx4VVgXvdWY0N1fh/ozpaD/kh7ZG3Hn6MGotpgyBw75FTr wWvw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qb34si19219947ejc.446.2022.01.02.09.23.02; Sun, 02 Jan 2022 09:23:03 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B24FB68B0E6; Sun, 2 Jan 2022 19:22:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30DC668B0E6 for ; Sun, 2 Jan 2022 19:22:50 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id j13so23483329plx.4 for ; Sun, 02 Jan 2022 09:22:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cdHZWxy5SATC+qlqCkRaLv3bDq4sj134PDT15W7hz94=; b=TEdW+D3pc/m6htMWKSQCaRCBnM15qXdk5MP7cMnQ0QtPqOYw5npFt/vBXkROPPYvom Ia2FpyaPL1hy4xUqrKPvjGxUTz0Tu6uHUn+IgBcD2IJFRRN43QZ+uNCq2hO6Xgx68+ah om0NdDn4T0qhjjWmub+/Enw75IgBCKtTfxOPz8NfDyVqgaZZ1g+COtVNCOs+VYNZ+F9j fK0yjXXcSzuhlQF3PxunwTLYAsdPx7Ei/0ZT3j0E7iID4jrTJDaQ4izC5XgOBJ4zpk6Y VTe6/b2O12F38zk3U6JUaBoCGjI56IndF9La4QQGoodrV2Ipb5dSAc7OI6K2eU1F/7Mz e8wA== X-Gm-Message-State: AOAM532UvfuVvq3Nq5n+df3Vwx3gDkaD0kXbqrr59yqvgdFL5p03MO6j 6btUaa7+DE2OxKgjHet9zWB8XtD7AI8= X-Received: by 2002:a17:90b:1e07:: with SMTP id pg7mr51969230pjb.228.1641144166454; Sun, 02 Jan 2022 09:22:46 -0800 (PST) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id g14sm33444826pjk.29.2022.01.02.09.22.44 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 02 Jan 2022 09:22:46 -0800 (PST) Received: by localhost (sSMTP sendmail emulation); Sun, 02 Jan 2022 09:22:27 -0800 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jan 2022 09:22:26 -0800 Message-Id: <20220102172226.12557-1-pal@sandflow.com> X-Mailer: git-send-email 2.34.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] avformat/imf: Fix error handling in set_context_streams_from_tracks() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oPJWb76+XIca From: Pierre-Anthony Lemieux Signed-off-by: Pierre-Anthony Lemieux --- libavformat/imfdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index f17064cfcd..da8c6cddea 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -564,9 +564,8 @@ static int set_context_streams_from_tracks(AVFormatContext *s) /* Copy stream information */ asset_stream = avformat_new_stream(s, NULL); if (!asset_stream) { - ret = AVERROR(ENOMEM); av_log(s, AV_LOG_ERROR, "Could not create stream\n"); - break; + return AVERROR(ENOMEM); } asset_stream->id = i; ret = avcodec_parameters_copy(asset_stream->codecpar, first_resource_stream->codecpar);