From patchwork Thu Jul 13 10:55:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42659 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2824206pzb; Thu, 13 Jul 2023 04:01:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlEOXxz5WmSlxLSbguWJYQEfGaKhKTOr5rUu3Cf+n8es4EMlLQfwLP82z+XmzLJ+WBvjmevn X-Received: by 2002:a17:907:39b:b0:989:450:e567 with SMTP id ss27-20020a170907039b00b009890450e567mr1282891ejb.65.1689246093228; Thu, 13 Jul 2023 04:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689246093; cv=none; d=google.com; s=arc-20160816; b=XHma2+e9FL4MuCElZLbRtx6xv6Dds69wMrOgZsFC1h3LSulgWFkeiA9J+k1CvtUvex vhnKQnjEpWzkokpvftDfEsbkMxZkKZrAVO5kZUEW9J8IM0AFxpfIJm+wpm96gBaZhuDk i8kXphsNK6JNAvbtfNCnvwFKTRTVDeblnE6Zgo4/ypS6YdyuNEuPR/TYpETlazCI+rIF nHL1KDTURyLs4JmsUPDplqxirjkwV6S2Yyd0uIZE8r10mxykJyWE9Ckvfwb2GhkrKA/F x647Nlmspoa9LXLtGXhpmr3sDwS0SKPNZMLOTQA0ABE0Ox9Y2WLnOQcFv6R10Ch/VcM6 hWJA== 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=hnRrrXqqe52IDb/1MS6rA8sCFZ7dv/y3KvVwONKMEWE=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=h32MPVyINgZJqLaV0fY+jngUHOSXmd2RQaJSJbUUeZXPGnkoFLLxEyhYZcgrFYo8FB eLuoJGG2zg5LGhrdukT8RyLymm7nnsWRqovIPbk825Oq9WCMcQhg6+vxgr1E9fw1Mw11 AaVAyd++NCAanIUkSrL3/K174WGfsCwF/u1rGvTJsaFSqi3xIFFh9IxRhDiTFp+Mlhlk l9QP+V7Rg25hfhyakbGElm5N/dgkzvOWrtk7sZy+4/TFT/38JSKAqMGqwVnZFi93uHRt 44hCPAnEtkE8GZLllKyufFX1jO978u4nE5VzUl25dMAmhtUrSZB9ULQlP9df4OE5+zIa x4lA== 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 y15-20020a170906448f00b00992e23f0e6asi7083991ejo.822.2023.07.13.04.01.32; Thu, 13 Jul 2023 04:01:33 -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 A4B1968C72D; Thu, 13 Jul 2023 13:58:16 +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 9EBF968C658 for ; Thu, 13 Jul 2023 13:57:55 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6C1FB2404EC for ; Thu, 13 Jul 2023 12:57:55 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id YjHxqlrI_2bZ for ; Thu, 13 Jul 2023 12:57:54 +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 D86F1240D22 for ; Thu, 13 Jul 2023 12:57:41 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id CB1EF3A1929 for ; Thu, 13 Jul 2023 12:57:35 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jul 2023 12:55:39 +0200 Message-Id: <20230713105553.21052-19-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713105553.21052-1-anton@khirnov.net> References: <20230713105553.21052-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/33] fftools/ffmpeg: return an error instead of aborting 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: DItvAnXYFTbj --- fftools/ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 96638242f3..68924d21e0 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1094,7 +1094,7 @@ static int process_input(int file_index) av_log(ifile, AV_LOG_ERROR, "Error retrieving a packet from demuxer: %s\n", av_err2str(ret)); if (exit_on_error) - exit_program(1); + return ret; } for (i = 0; i < ifile->nb_streams; i++) {