From patchwork Thu Jul 13 10:55:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42651 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2823220pzb; Thu, 13 Jul 2023 04:00:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlErQyOynQmo2DkBixzg/Aha3JNpn5FWZuoUz6WOAXtUL9AzYO//7YxGtYRWPa5K4OzHNJeV X-Received: by 2002:aa7:d84f:0:b0:51e:309:2e12 with SMTP id f15-20020aa7d84f000000b0051e03092e12mr1737930eds.28.1689246010919; Thu, 13 Jul 2023 04:00:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689246010; cv=none; d=google.com; s=arc-20160816; b=coEYcUJ4QhMwcRr7kTcpC9wHkVwFB6vnJhSNYYEaMgeLin5c6VQj8x9sVSuomEsMCy tUpadfTFnHS3p3LmxRlcqlt5DA3UosmSPVSCLr0w+jPy5Y2TVqwT51PYqT658Q3EHN3M N80Nr4Ra9TiKS/80TukkvP95l1UvH0n6av1ar2uiN1+qJsOrt4Y45oII8Qj1umupICpN 5VxU4gSq/VseIWpZzYkhTQobfPq48WpBgYXpqqe6FxzdJP+kZLBYUpTUY2GMWNy7tOnC AGnUoow/5I6GPCFTyhe/8aNKVvNqiK+Nk24u3Ckcp5QZEjtTrWOI6Hmr7P1XUkdY9HL3 iDEw== 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=9TS/9LcqQ+uboeT298+j1AxVnH6oWCWC0k0GdAZI2kc=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=OEm5DO+bQQYuUkrMTtkr3PLZF1eDgIDz+ZWYslTTToUraeUbTU/MqlUP+pomTZNhNh TK3qFTNqqPVZAjmTaBr5qIqdtW26bj40oP2LvxQnQbpkhDa4ZUz/2XVDqnua/2dcNgLz aWicb64cD3YUtXsFfZPGywdaf1eM9nIc4ujLXhqF7I9339XwGUec+AcJSSB4aNhYqfeC n50/19AaFLIbNxcLO+3EZrG/vMPFlOfQVO9fwfeg+/Kq6iz3fAMHPmgxzV0xuNY2D/XC +s2HInY4ZaL0xI+3brkO8zuK3h3Z/x7oe0Jgbue6YhPz0krInMFzPk5TVQP3JNxt2pAD fP7w== 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 a12-20020aa7cf0c000000b0051e01f391besi6425606edy.581.2023.07.13.04.00.10; Thu, 13 Jul 2023 04:00:10 -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 3530A68C6D9; Thu, 13 Jul 2023 13:58:07 +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 E689E68C691 for ; Thu, 13 Jul 2023 13:57:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D144B2405F9 for ; Thu, 13 Jul 2023 12:57:45 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id TCI5N3Iz8NSe for ; Thu, 13 Jul 2023 12:57: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 8CF1E2406CA 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 850AD3A15FA 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:33 +0200 Message-Id: <20230713105553.21052-13-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 13/33] fftools/ffmpeg_mux_init: return error codes from copy_meta() 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: oTgkMJtuaZE3 --- fftools/ffmpeg_mux_init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 8ad799f951..f85357d8e4 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2089,7 +2089,7 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic, return 0; } -static void copy_meta(Muxer *mux, const OptionsContext *o) +static int copy_meta(Muxer *mux, const OptionsContext *o) { OutputFile *of = &mux->of; AVFormatContext *oc = mux->fc; @@ -2106,7 +2106,7 @@ static void copy_meta(Muxer *mux, const OptionsContext *o) if (in_file_index >= nb_input_files) { av_log(mux, AV_LOG_FATAL, "Invalid input file index %d while " "processing metadata maps\n", in_file_index); - exit_program(1); + return AVERROR(EINVAL); } copy_metadata(mux, in_file_index >= 0 ? input_files[in_file_index]->ctx : NULL, @@ -2128,7 +2128,7 @@ static void copy_meta(Muxer *mux, const OptionsContext *o) } else { av_log(mux, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n", chapters_input_file); - exit_program(1); + return AVERROR(EINVAL); } } if (chapters_input_file >= 0) @@ -2157,6 +2157,8 @@ static void copy_meta(Muxer *mux, const OptionsContext *o) av_dict_set(&ost->st->metadata, "encoder", NULL, 0); } } + + return 0; } static int set_dispositions(Muxer *mux, const OptionsContext *o) @@ -2533,7 +2535,9 @@ int of_open(const OptionsContext *o, const char *filename) oc->max_delay = (int)(o->mux_max_delay * AV_TIME_BASE); /* copy metadata and chapters from input files */ - copy_meta(mux, o); + err = copy_meta(mux, o); + if (err < 0) + return err; of_add_programs(mux, o); of_add_metadata(of, oc, o);