Message ID | 20230715104611.17902-42-anton@khirnov.net |
---|---|
State | Accepted |
Commit | 140cb5a74294f62343f327049057089a3e3abf5b |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4240661pzb; Sat, 15 Jul 2023 03:51:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlH3QDEIeOw4wBQFkXZyS/duhNdj2QPR1wjWhzai92TdBEyK1pyqvU7hFn/NEZ/jwtUuw/AV X-Received: by 2002:a17:906:5a45:b0:977:95f4:5cca with SMTP id my5-20020a1709065a4500b0097795f45ccamr6443451ejc.54.1689418281645; Sat, 15 Jul 2023 03:51:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689418281; cv=none; d=google.com; s=arc-20160816; b=wvi4098I3Vi5ibFVMeLBOE4T3+WA88q0KJPaNVe8Tep5O1hPBGpuuRPtHxUHGeiAZP N9WT4S/qamSYL4mXrPYhP7q1hwCV8IwJVnLyaFR1WpGinmSSarN81GkHJlEK8jk6Vo0G 2WM9TJvWc6R/sSi6Cql5CoWoOelcOPLIue9+Dk1hCCI3CntcvlFbXu8r+2r6YOH1vMm1 +lYBkfbXk60XtdD2sGGGyg2g2spmXRnkfsm1pcUQZZ62E76xuMUs8uS+zUSEs6Oigl37 MidhRBWH+sC0IjrOSKIoDG/VZIAMT3R7K7lYzfsmbj8bR8Yr55GzUElu3S7Jn6V71bAK rEkA== 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=EW2Q0gtJgIWxdLG3CBUU5jT9sQnV2cyg9gnIO5EXagw=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=0ms+5VqPItr4XajCzuPfEw4a2vGM8UqJ+qMff4TBBnhkOJ3a/HJAJJmItgJT3H7waZ 3jV+mEPtNSbxAEtx3tYiFgGnOmmgJATevUkhOKXJpuOrv7a5ea5vELxy3ziGq9MTVoOC 4MbsdJgbqUnGQzhmfUGUIhs2ZHZutuOyn4CbsVUyMNGBJanxkgY7LV4dRTs1EvwUHGR5 Hxo7mVkDCebM8YYXPdGaCophaVxFonK1MMrBqwBsAcZeHIKZDbfOGXox36jGkyZdxPXC iRNSzVUeruP2DjLs9K+lg1Xww4OSVs0M7IVSFMdrxcIlFiPC7KJ6+1RlJpcQ7F4U3tkY XF6w== 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b21-20020a1709062b5500b009924806cd01si9922709ejg.386.2023.07.15.03.51.21; Sat, 15 Jul 2023 03:51:21 -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 A424868C77A; Sat, 15 Jul 2023 13:47:11 +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 CB7F868C39F for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Jul 2023 13:46:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 8F1172404EE for <ffmpeg-devel@ffmpeg.org>; 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 AAh-ssdGVDZ4 for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Jul 2023 12:46:47 +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 291E3240D2B for <ffmpeg-devel@ffmpeg.org>; 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 E57EF3A2832 for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Jul 2023 12:46:21 +0200 (CEST) From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 12:46:06 +0200 Message-Id: <20230715104611.17902-42-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 42/47] fftools/ffprobe: replace report_and_exit() with returning error codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: B+mY6UauZiKC |
Series |
[FFmpeg-devel,01/47] fftools/ffmpeg_mux_init: handle pixel format endianness
|
expand
|
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index c83d20995e..6180a5c952 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3350,7 +3350,7 @@ static int open_input_file(InputFile *ifile, const char *filename, fmt_ctx = avformat_alloc_context(); if (!fmt_ctx) - report_and_exit(AVERROR(ENOMEM)); + return AVERROR(ENOMEM); if (!av_dict_get(format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE)) { av_dict_set(&format_opts, "scan_all_pmts", "1", AV_DICT_DONT_OVERWRITE); @@ -3377,7 +3377,7 @@ static int open_input_file(InputFile *ifile, const char *filename, err = setup_find_stream_info_opts(fmt_ctx, codec_opts, &opts); if (err < 0) - report_and_exit(err); + return err; err = avformat_find_stream_info(fmt_ctx, opts);