ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Wed Apr 5 20:17:48 2017 +0200| [1f9419753667beb6298d8d8b683211680abb4fe6] | committer: Marton Balint
ffprobe: only use custom logging callback if -show_log is set The custom callback can cause significant CPU usage on Windows for some large files with many index entries for some reason. v2: Move check after parsing options. Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f9419753667beb6298d8d8b683211680abb4fe6 --- ffprobe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index 0a9ba14d8d..72f5ed7182 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -3458,8 +3458,6 @@ int main(int argc, char **argv) goto end; } #endif - av_log_set_callback(log_callback); - av_log_set_flags(AV_LOG_SKIP_REPEATED); register_exit(ffprobe_cleanup); @@ -3475,6 +3473,9 @@ int main(int argc, char **argv) show_banner(argc, argv, options); parse_options(NULL, argc, argv, options, opt_input_file); + if (do_show_log) + av_log_set_callback(log_callback); + /* mark things to show, based on -show_entries */ SET_DO_SHOW(CHAPTERS, chapters); SET_DO_SHOW(ERROR, error); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
