From patchwork Thu Jul 13 10:55:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42648 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2822833pzb; Thu, 13 Jul 2023 03:59:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlHZ2Uz6XjvZHK7duJ1wvDv0HeeFMcr45jJpC0LQSEec2Evga6liVQpzI+L0vLoKkzAgk1Up X-Received: by 2002:a17:906:eb82:b0:991:f7cb:cc3d with SMTP id mh2-20020a170906eb8200b00991f7cbcc3dmr1137419ejb.65.1689245968249; Thu, 13 Jul 2023 03:59:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689245968; cv=none; d=google.com; s=arc-20160816; b=t/CUoRocZtLke45EkF2TGonK5hv4hJ5Lz5hw2dBEPd+XFbBAhupCql8+8ye1Nuhbc7 9xzE7RPJgi8VrLlbCDRa5wTu2sVB9fnB3tvUUXMhB27SZU4fW5f7wou9qZyXCIeOYT5c 1C4dF+C6BV6KrU1Qz7K/bfrpxTAloz3CwZ8qpFy9L6ZQHxBxspXIy/v/PEtvP15PGSNe U8y9Xby/HK6fWwYWR+upjQQrlTt6hJLYQc9xOWI/XVPt5RkdoFuqC9ehH3nShH+6lHFW XPJam6wWNev8HLoRUUxQ224XB2fNwl9WmyFVPFwNn8/phabHSnKuhPclkJz2d4AoaKQ7 06Tg== 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=PtBWHTxwgmqSD08wSbBdmiMDnYtiP2FPB1sdAp7YwFA=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=QrJ+JtSI/Q5F5fOgY5VGzV68Iw0K3ZqghHW35k6SWfzuBbv+f1T6GwEMaq1Y9FFB7C Jl3CClLEfX0sWLhRnpCad4JIgUwPwmCd6pO5hQFquBHFQXK0WKqHg4gC7bFZPZQgzhu+ FmTkIIeMAw1UYUDUoz5HpWl0rH45F4hfUbzMkPnY+fw4iHTY5OKSH1iOzcq2wC+4Rmty 3qrM+lbGLg+7ZOd4tY6FysQwMoP7/43nJjFxBuM+Du9zz2/Wo/ZQROoxoVFHQSNRiCdE IgiIX6Jsm1cWQQ7DPA1zuxyf5U+jC6ycLJpjUhHEQAKLA3OmyXdDcB1o65aMNTvyXfGX xBdw== 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 p6-20020a1709060dc600b0098e291bed8fsi27754eji.451.2023.07.13.03.59.27; Thu, 13 Jul 2023 03:59:28 -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 06DEF68C665; Thu, 13 Jul 2023 13:58:01 +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 4FD8668C67D for ; Thu, 13 Jul 2023 13:57:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B0C782404EC for ; Thu, 13 Jul 2023 12:57:44 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Q-e-in4oZQtn for ; Thu, 13 Jul 2023 12:57:44 +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 78C6A2405B5 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 4C26D3A12E0 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:28 +0200 Message-Id: <20230713105553.21052-8-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 08/33] fftools/ffmpeg_mux_init: return errors from create_streams() 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: pChCknRdsfR0 --- fftools/ffmpeg_mux_init.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 4d40ceda05..dbc58abea8 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1558,7 +1558,7 @@ static void of_add_attachments(Muxer *mux, const OptionsContext *o) } } -static void create_streams(Muxer *mux, const OptionsContext *o) +static int create_streams(Muxer *mux, const OptionsContext *o) { AVFormatContext *oc = mux->fc; int auto_disable_v = o->video_disable; @@ -1616,8 +1616,10 @@ static void create_streams(Muxer *mux, const OptionsContext *o) if (!oc->nb_streams && !(oc->oformat->flags & AVFMT_NOSTREAMS)) { av_dump_format(oc, nb_output_files - 1, oc->url, 1); av_log(mux, AV_LOG_ERROR, "Output file does not contain any stream\n"); - exit_program(1); + return AVERROR(EINVAL); } + + return 0; } static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_us) @@ -2426,7 +2428,9 @@ int of_open(const OptionsContext *o, const char *filename) } /* create all output streams for this file */ - create_streams(mux, o); + err = create_streams(mux, o); + if (err < 0) + return err; /* check if all codec options have been used */ validate_enc_avopt(mux, o->g->codec_opts);