diff mbox series

[FFmpeg-devel,38/47] fftools/ffmpeg: consolidate exiting from main() on error

Message ID 20230715104611.17902-38-anton@khirnov.net
State Accepted
Commit 8173623e39cc72866eaaac13538e160f226b0a23
Headers show
Series [FFmpeg-devel,01/47] fftools/ffmpeg_mux_init: handle pixel format endianness | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov July 15, 2023, 10:46 a.m. UTC 
---
 fftools/ffmpeg.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index b4ea52ac1d..0c5e553c72 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1339,17 +1339,19 @@  int main(int argc, char **argv)
     /* parse options and open all input/output files */
     ret = ffmpeg_parse_options(argc, argv);
     if (ret < 0)
-        exit_program(1);
+        goto finish;
 
     if (nb_output_files <= 0 && nb_input_files == 0) {
         show_usage();
         av_log(NULL, AV_LOG_WARNING, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
-        exit_program(1);
+        ret = 1;
+        goto finish;
     }
 
     if (nb_output_files <= 0) {
         av_log(NULL, AV_LOG_FATAL, "At least one output file must be specified\n");
-        exit_program(1);
+        ret = 1;
+        goto finish;
     }
 
     current_time = ti = get_benchmark_time_stamps();
@@ -1368,6 +1370,7 @@  int main(int argc, char **argv)
     ret = received_nb_signals ? 255 :
           err_rate_exceeded   ?  69 : ret;
 
+finish:
     exit_program(ret);
     return ret;
 }