From patchwork Sat Jul 15 10:46:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42725 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4240600pzb; Sat, 15 Jul 2023 03:51:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlG+oWZ3JpT5YdM0JmJLFDFREb6Mcty+3bkg7Wr9RFCDVV9GMocxA50cSnht6G5K4iU2a+zk X-Received: by 2002:a17:906:7397:b0:994:18c4:3303 with SMTP id f23-20020a170906739700b0099418c43303mr6900078ejl.18.1689418274054; Sat, 15 Jul 2023 03:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689418274; cv=none; d=google.com; s=arc-20160816; b=gcpCHP5K65YZSHlJSxfsn+dm6MaGVsUOKp1Z76WgQxbo63HJHojACKJFOE5L1RdZBW w9T3jSPtig9531ZUD1El2xDcFwnuTIFFJPVa+Ys/eZxdMkJ+1De9br9pHqsBr1C0OCS3 sGxrGIobizJJl4yh5oBwBV0m7YjMJl1XQiZUaE0lUn7mzFaR1bjk3/2IqAQgGXb5ozlY nKJpC6M/wD9kuGXT04lpCb2haahC49RoDztWZ2oniHhdfQMxtnbTD1wzlX+bvsVbQ1C+ rBFeLTbQxjFzEWcnX9oN66hEsttUQpQGOeNRtB/Je4IpOUXO14/4Chz02C4CQ/gBHwqG GJiA== 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=inkl//CimXe+vEr6A5prS2n/pZNdfIRD8UxxWkqROmg=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=NOAUfCvkTgNfbhOPgeNDKlvzdAJP6yqTCnjh7MA+KSXzJ2qgUbVdSh/9mjZDX3oaMt YPBqYNDKsTjG/sZQAn4qA+oVCq8yUBDAP71rc/eTc63H0sAbb1+QWUTvKXOP1v20chG3 K+Gji/4sifYNGSOa1Dtgpbz1IUEShNZnAbTv3Cf5n78eyZYB6594WsmJ4L3cSKK2e/aC dtr49fevJq0vppbPddTOh0uNiAG76lqpteXXzeItY17u4FaqoRPMZLGmuplZBvp8zjtD IRDt7MFm8Bdwn7Tpmofah3/aX3WvnmnIFKKPOgY1bpYDimAVdusVbhF4/BGX/2Z7fA5e GEIg== 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 r21-20020aa7d155000000b0051a53f2684fsi9554578edo.576.2023.07.15.03.51.13; Sat, 15 Jul 2023 03:51:14 -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 B868068C773; Sat, 15 Jul 2023 13:47:10 +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 51AC268C6D5 for ; Sat, 15 Jul 2023 13:46:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 050942404EE for ; Sat, 15 Jul 2023 12:46:47 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ybc8HmtfxvU8 for ; Sat, 15 Jul 2023 12:46:46 +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 2972A240D2C for ; Sat, 15 Jul 2023 12:46:27 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id F06333A283F for ; Sat, 15 Jul 2023 12:46:21 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 12:46:07 +0200 Message-Id: <20230715104611.17902-43-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230715104611.17902-1-anton@khirnov.net> References: <20230715104611.17902-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 43/47] fftools/ffplay: replace report_and_exit() with returning an error code 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: TiNilOy3qVEg --- fftools/ffplay.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index a491fdd9e3..5212ad053e 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2784,8 +2784,12 @@ static int read_thread(void *arg) int orig_nb_streams = ic->nb_streams; err = setup_find_stream_info_opts(ic, codec_opts, &opts); - if (err < 0) - report_and_exit(err); + if (err < 0) { + av_log(NULL, AV_LOG_ERROR, + "Error setting up avformat_find_stream_info() options\n"); + ret = err; + goto fail; + } err = avformat_find_stream_info(ic, opts);