Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'

[ffmpeg] / ffprobe.c

diff --git a/ffprobe.c b/ffprobe.c
index 0a9ba14d8dc430ac960139ac10e2e598a1dad9ff..72f5ed7182e15e3854fcd11eddafa1ae27340ca1 100644 (file)
--- 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);