From patchwork Thu Jul 13 10:55:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42657 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2824019pzb; Thu, 13 Jul 2023 04:01:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlFv/dE9qdccaWSZGS9lEH74LEIKGMqb1i62asYJQwT+16kEWJlw17gi5hvt8oCLkXtnkycj X-Received: by 2002:a17:906:1046:b0:994:1eb4:6896 with SMTP id j6-20020a170906104600b009941eb46896mr2160766ejj.25.1689246075663; Thu, 13 Jul 2023 04:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689246075; cv=none; d=google.com; s=arc-20160816; b=Cttr2zW5f+kcScZAWEpciQB//rg+7UKhNVOfwTwfnUfvQfevsClnVpW0n32wO5O+dW KJfYRO0ceitDcA6SaPeW7/49wv33FXTQn5caCG7wMG2eVcjenS6niSC9M+9aZQcxc9Yd Al+eHUm/Be583W5VeFv8P3KWrCtiP4JBiK0qioQwLLsxqEj90XJhZg9P+iRCElboF/2S mjbspNGynvk+eGqzu8rc7UBULluU6CQN1URpV10Nrb7WABh30EW285kQmzGggRDbjg8p NgGzxAb8sYNJAoCPfQivIl7OgRFhtdu607lAOzSVAVljLnAxZhmvH90JvjAP5GqIZIXh 4MYg== 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=RLIsNa9j7BVKpBVnhCo9F+f9TQsMJHdYjlyBs12X4v8=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=pwLoPEmaoxipSQ5aq/S+y+3RNMyBH2t0Zu6MIFi+42ijEQhQ9bqoyPsylPS9JdsXhG Om9Nx/9gBzXx7EWpOVn24FAfBIgiFo7yrow9OR2UwzFgm3Frfqfwsvhx05pC/pCUvNwo 9sHMQR2Cx5GVHqH5UNJyPkWW3Be6J39BmNC6UpZi9ddakPl4/iyiR7ZZWsSK/pqUQyvf TFzFUopQZ++hK+DTTI9Gc1FTWnPXar09GNtelnIs5OYEdr8UdDxs/yQhCEBrtzKfymJb q9vkGgzooPCDhdH0UOEsfBr+c4Zo2tOQ3dJui6H8cEytERhoHmCCgIDkraP61Q4Pd3Y6 6Xig== 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 hb11-20020a170906b88b00b00988ac7422e4si6479867ejb.630.2023.07.13.04.01.15; Thu, 13 Jul 2023 04:01:15 -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 88DDC68C71F; Thu, 13 Jul 2023 13:58:14 +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 5F7B368C698 for ; Thu, 13 Jul 2023 13:57:54 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 1CAA02404EA for ; Thu, 13 Jul 2023 12:57:54 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id cwjitx6H1HqZ for ; Thu, 13 Jul 2023 12:57:52 +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 C40BC240D1B 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 9C7EF3A1711 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:35 +0200 Message-Id: <20230713105553.21052-15-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 15/33] fftools/ffmpeg_mux_init: return error codes from validate_enc_avopt() 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: L0noIfK8jdgs --- 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 7a8c935795..3a327048bb 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2342,7 +2342,7 @@ static int process_forced_keyframes(Muxer *mux, const OptionsContext *o) return 0; } -static void validate_enc_avopt(Muxer *mux, const AVDictionary *codec_avopt) +static int validate_enc_avopt(Muxer *mux, const AVDictionary *codec_avopt) { const AVClass *class = avcodec_get_class(); const AVClass *fclass = avformat_get_class(); @@ -2370,7 +2370,7 @@ static void validate_enc_avopt(Muxer *mux, const AVDictionary *codec_avopt) if (!(option->flags & AV_OPT_FLAG_ENCODING_PARAM)) { av_log(mux, AV_LOG_ERROR, "Codec AVOption %s (%s) is not an " "encoding option.\n", e->key, option->help ? option->help : ""); - exit_program(1); + return AVERROR(EINVAL); } // gop_timecode is injected by generic code but not always used @@ -2384,6 +2384,8 @@ static void validate_enc_avopt(Muxer *mux, const AVDictionary *codec_avopt) "any stream.\n", e->key, option->help ? option->help : ""); } av_dict_free(&unused_opts); + + return 0; } static int init_output_stream_nofilter(OutputStream *ost) @@ -2502,7 +2504,9 @@ int of_open(const OptionsContext *o, const char *filename) return err; /* check if all codec options have been used */ - validate_enc_avopt(mux, o->g->codec_opts); + err = validate_enc_avopt(mux, o->g->codec_opts); + if (err < 0) + return err; /* check filename in case of an image number is expected */ if (oc->oformat->flags & AVFMT_NEEDNUMBER && !av_filename_number_test(oc->url)) {