virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffprobe: stop calling exit_program()

Browse Source 
Inline the relevant part of ffprobe_cleanup() into main() and drop the
rest.
This commit is contained in:
Anton Khirnov
2023-07-14 18:33:12 +02:00
parent be49c48282
commit a81d9231b9
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fftools/ffprobe.c
View File

@@ -381,17 +381,6 @@ static void log_callback(void *ptr, int level, const char *fmt, va_list vl)
#endif #endif
} }
static void ffprobe_cleanup(int ret)
{
int i;
for (i = 0; i < FF_ARRAY_ELEMS(sections); i++)
av_dict_free(&(sections[i].entries_to_show));
#if HAVE_THREADS
pthread_mutex_destroy(&log_mutex);
#endif
}
struct unit_value { struct unit_value {
union { double d; long long int i; } val; union { double d; long long int i; } val;
const char *unit; const char *unit;
@@ -4113,7 +4102,6 @@ int main(int argc, char **argv)
} }
#endif #endif
av_log_set_flags(AV_LOG_SKIP_REPEATED); av_log_set_flags(AV_LOG_SKIP_REPEATED);
register_exit(ffprobe_cleanup);
options = real_options; options = real_options;
parse_loglevel(argc, argv, options); parse_loglevel(argc, argv, options);
@@ -4124,8 +4112,10 @@ int main(int argc, char **argv)
show_banner(argc, argv, options); show_banner(argc, argv, options);
ret = parse_options(NULL, argc, argv, options, opt_input_file); ret = parse_options(NULL, argc, argv, options, opt_input_file);
if (ret < 0) if (ret < 0) {
exit_program(ret == AVERROR_EXIT ? 0 : 1); ret = AVERROR_EXIT ? 0 : ret;
goto end;
}
if (do_show_log) if (do_show_log)
av_log_set_callback(log_callback); av_log_set_callback(log_callback);
@@ -4249,5 +4239,9 @@ end:
avformat_network_deinit(); avformat_network_deinit();
#if HAVE_THREADS
pthread_mutex_destroy(&log_mutex);
#endif
return ret < 0; return ret < 0;
} }