[FFmpeg-cvslog] fftools/ffprobe: replace report_and_exit() with returning error codes

Anton Khirnov git at videolan.org
Thu Jul 20 21:57:44 EEST 2023


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Jul 14 18:21:39 2023 +0200| [140cb5a74294f62343f327049057089a3e3abf5b] | committer: Anton Khirnov

fftools/ffprobe: replace report_and_exit() with returning error codes

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=140cb5a74294f62343f327049057089a3e3abf5b
---

 fftools/ffprobe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);
 



More information about the ffmpeg-cvslog mailing list