From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 19DA746228 for ; Thu, 13 Jul 2023 10:59:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAB6E68C6E1; Thu, 13 Jul 2023 13:58:01 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B1E968C654 for ; Thu, 13 Jul 2023 13:57:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 7D4DB2404F5 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 uD8pCd137eAg for ; Thu, 13 Jul 2023 12:57:42 +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 65ADE2404EC 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 096533A0F81 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:22 +0200 Message-Id: <20230713105553.21052-2-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 02/33] fftools/ffmpeg_demux: return errors from ifile_open() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- fftools/ffmpeg_demux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 5d3e043793..a6df2a1904 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1349,7 +1349,7 @@ int ifile_open(const OptionsContext *o, const char *filename) int64_t start = start_time == AV_NOPTS_VALUE ? 0 : start_time; if (stop_time <= start) { av_log(d, AV_LOG_ERROR, "-to value smaller than -ss; aborting.\n"); - exit_program(1); + return AVERROR(EINVAL); } else { recording_time = stop_time - start; } @@ -1358,7 +1358,7 @@ int ifile_open(const OptionsContext *o, const char *filename) if (o->format) { if (!(file_iformat = av_find_input_format(o->format))) { av_log(d, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format); - exit_program(1); + return AVERROR(EINVAL); } } @@ -1372,7 +1372,7 @@ int ifile_open(const OptionsContext *o, const char *filename) /* get default parameters from command line */ ic = avformat_alloc_context(); if (!ic) - report_and_exit(AVERROR(ENOMEM)); + return AVERROR(ENOMEM); if (o->nb_audio_sample_rate) { av_dict_set_int(&o->g->format_opts, "sample_rate", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i, 0); } @@ -1446,7 +1446,7 @@ int ifile_open(const OptionsContext *o, const char *filename) "Error opening input: %s\n", av_err2str(err)); if (err == AVERROR_PROTOCOL_NOT_FOUND) av_log(d, AV_LOG_ERROR, "Did you mean file:%s?\n", filename); - exit_program(1); + return err; } av_strlcat(d->log_name, "/", sizeof(d->log_name)); @@ -1477,7 +1477,7 @@ int ifile_open(const OptionsContext *o, const char *filename) av_log(d, AV_LOG_FATAL, "could not find codec parameters\n"); if (ic->nb_streams == 0) { avformat_close_input(&ic); - exit_program(1); + return ret; } } } @@ -1490,7 +1490,7 @@ int ifile_open(const OptionsContext *o, const char *filename) if (start_time_eof != AV_NOPTS_VALUE) { if (start_time_eof >= 0) { av_log(d, AV_LOG_ERROR, "-sseof value must be negative; aborting\n"); - exit_program(1); + return AVERROR(EINVAL); } if (ic->duration > 0) { start_time = start_time_eof + ic->duration; @@ -1547,7 +1547,7 @@ int ifile_open(const OptionsContext *o, const char *filename) f->readrate = o->readrate ? o->readrate : 0.0; if (f->readrate < 0.0f) { av_log(d, AV_LOG_ERROR, "Option -readrate is %0.3f; it must be non-negative.\n", f->readrate); - exit_program(1); + return AVERROR(EINVAL); } if (o->rate_emu) { if (f->readrate) { @@ -1562,7 +1562,7 @@ int ifile_open(const OptionsContext *o, const char *filename) av_log(d, AV_LOG_ERROR, "Option -readrate_initial_burst is %0.3f; it must be non-negative.\n", d->readrate_initial_burst); - exit_program(1); + return AVERROR(EINVAL); } } else if (o->readrate_initial_burst) { av_log(d, AV_LOG_WARNING, "Option -readrate_initial_burst ignored " @@ -1601,7 +1601,7 @@ int ifile_open(const OptionsContext *o, const char *filename) if (!(option->flags & AV_OPT_FLAG_DECODING_PARAM)) { av_log(d, AV_LOG_ERROR, "Codec AVOption %s (%s) is not a decoding " "option.\n", e->key, option->help ? option->help : ""); - exit_program(1); + return AVERROR(EINVAL); } av_log(d, AV_LOG_WARNING, "Codec AVOption %s (%s) has not been used " -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".