From patchwork Mon Apr 4 11:30:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1915583pzb; Mon, 4 Apr 2022 04:40:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdJemOWSSBztsYzbhArskT6rcFR9g3j8TWXUPo9xt0RxDd0izrJyOgIaZ/oxrvYeIjLkNJ X-Received: by 2002:a05:6402:1941:b0:413:2b7e:676e with SMTP id f1-20020a056402194100b004132b7e676emr33508362edz.114.1649072424594; Mon, 04 Apr 2022 04:40:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649072424; cv=none; d=google.com; s=arc-20160816; b=fPA1fWpNTb3m5+RdS2zrOKh6zOgFD3Bnpcy4AaaHLp77aaj5af864mt4S8v88fhyDt 9kPBimVqgEUZPIIxDjVwx12QJJVZkgW55F1EeV5fQzbxLCFwSrd0uKyEITZh4cV80htu MJfuQU8kVGhT/MFoxYqBhB76bihQiN8SWJ1at/oueqLXuvky6DPHN4CqGS5toBoqdZML etPvbsewz2+ppelwTkSeL2/Ang+b6HwdAAYsKMLnbkGSmy94TRDZ/zJXMYo7sUDxQ9rx L0K57Ng8Uo20FBNPbhCV9t1iRLy/etVZjn+Ggsw4UPPJR8e9GN8R6Px3qdU42i3wcVfa GybQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=/sqvWa77ji8BUVrLZGr0KvekEXRMEWdzBybGnnwpn/4=; b=g34I6Jwlnm9mJ2DIC1eF10Cd61T7DKzrjrin7Y6aTbW5Fqngm2/l/XDh5ebNaBScRC 0p2G8ddXRiGMt9t6xTKoU3pAFd5f3YG3I0pfOXI0DZo4RXUxeTwE8cjHbU5op7IN1fkP N6YKI5rfWHawru50x1R9YbuA291CsvZy9MlhJHw7XM7HwMV5ipEP7P/og2z65z+ty6zt 0qx5J/VqZetNwhYb3jxrMc14YNgUnCpIPeLrgzX99L0k260gxqMjzqs1QSshvqWLcG8r S91owhngJnGQ09yJfwk2urRq3HpXVyNWoUJ5aU1OKrjg4Ex6sXH6lWP3duWlyRkDvHay R4cQ== 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 ek23-20020a056402371700b0041cb6e3d71dsi3169010edb.627.2022.04.04.04.40.24; Mon, 04 Apr 2022 04:40:24 -0700 (PDT) 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 0AC7B68B388; Mon, 4 Apr 2022 14:37:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D36B68B2AF for ; Mon, 4 Apr 2022 14:37:46 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E02C3240506 for ; Mon, 4 Apr 2022 13:37:45 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id WZDn2jI9ZA7u for ; Mon, 4 Apr 2022 13:37:45 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id B4CD324055A for ; Mon, 4 Apr 2022 13:37:41 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 36EA93A0E23; Mon, 4 Apr 2022 13:32:12 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 13:30:28 +0200 Message-Id: <20220404113037.13070-41-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220404113037.13070-1-anton@khirnov.net> References: <20220404113037.13070-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 40/49] fftools/ffmpeg_mux: return errors from submit_packet() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GFf78jCBKHH+ --- fftools/ffmpeg_mux.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 3ea7636380..69af2c8d46 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -253,7 +253,7 @@ static void write_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) } } -static void submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) +static int submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) { int ret; @@ -264,9 +264,11 @@ static void submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) ret = queue_packet(of, ost, pkt); if (ret < 0) { av_packet_unref(pkt); - exit_program(1); + return ret; } } + + return 0; } int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof) @@ -290,10 +292,12 @@ int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof) else if (ret < 0) return ret; - submit_packet(of, pkt, output_streams[of->ost_index + ret]); + ret = submit_packet(of, pkt, output_streams[of->ost_index + ret]); + if (ret < 0) + return ret; } } else if (!eof) - submit_packet(of, pkt, ost); + return submit_packet(of, pkt, ost); return 0; }