highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg: consolidate exiting from main() on error

Browse Source
This commit is contained in:
Anton Khirnov 2023-07-14 18:10:58 +02:00
parent c56fabde27
commit 8173623e39
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fftools/ffmpeg.c
View File

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