cmdutils: make show_usage() use av_log()

Avoid printing on stdout when show_usage is used in an error message.

diff --git a/avconv.c b/avconv.c
index e02139db71932ef6ed9c941f5642439322f327fd..9fae43a5c2cbbbe88562bdd547049cd3de06e29f 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -4187,9 +4187,9 @@ static int opt_audio_qscale(OptionsContext *o, const char *opt, const char *arg)
 
 static void show_usage(void)
 {
-    printf("Hyper fast Audio and Video encoder\n");
-    printf("usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name);
-    printf("\n");
+    av_log(NULL, AV_LOG_INFO, "Hyper fast Audio and Video encoder\n");
+    av_log(NULL, AV_LOG_INFO, "usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name);
+    av_log(NULL, AV_LOG_INFO, "\n");
 }
 
 static int opt_help(const char *opt, const char *arg)

diff --git a/ffmpeg.c b/ffmpeg.c
index 15ce0894ac2717782a27f7e1b6839fa1aa80d671..13d7d6cf5e48342eb555364bf8b0b62904a4ec00 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4593,9 +4593,9 @@ static int opt_audio_qscale(OptionsContext *o, const char *opt, const char *arg)
 
 static void show_usage(void)
 {
-    printf("Hyper fast Audio and Video encoder\n");
-    printf("usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name);
-    printf("\n");
+    av_log(NULL, AV_LOG_INFO, "Hyper fast Audio and Video encoder\n");
+    av_log(NULL, AV_LOG_INFO, "usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name);
+    av_log(NULL, AV_LOG_INFO, "\n");
 }
 
 static int opt_help(const char *opt, const char *arg)

diff --git a/ffplay.c b/ffplay.c
index 1a1b3f714bc618b83a6d6bcafe7c8011ca65c1a2..1c4289c287a23bc4b07368db0a12d0864b255707 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -3105,9 +3105,9 @@ static const OptionDef options[] = {
 
 static void show_usage(void)
 {
-    printf("Simple media player\n");
-    printf("usage: %s [options] input_file\n", program_name);
-    printf("\n");
+    av_log(NULL, AV_LOG_INFO, "Simple media player\n");
+    av_log(NULL, AV_LOG_INFO, "usage: %s [options] input_file\n", program_name);
+    av_log(NULL, AV_LOG_INFO, "\n");
 }
 
 static int opt_help(const char *opt, const char *arg)

diff --git a/ffprobe.c b/ffprobe.c
index 34626a8fc9e9fd8cb0ef77b8216ea263056e33f2..28e056390d29e886dbdc85efb58daea36c1ae4ad 100644 (file)
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1439,9 +1439,9 @@ end:
 
 static void show_usage(void)
 {
-    printf("Simple multimedia streams analyzer\n");
-    printf("usage: %s [OPTIONS] [INPUT_FILE]\n", program_name);
-    printf("\n");
+    av_log(NULL, AV_LOG_INFO, "Simple multimedia streams analyzer\n");
+    av_log(NULL, AV_LOG_INFO, "usage: %s [OPTIONS] [INPUT_FILE]\n", program_name);
+    av_log(NULL, AV_LOG_INFO, "\n");
 }
 
 static int opt_format(const char *opt, const char *arg)