[FFmpeg-cvslog] ff*: Fix duplicatedly printed version info with -version

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 20 22:03:25 2011 +0100| [452406bd5bbf21a0da7104e6edca9c6e70636511] | committer: Michael Niedermayer

ff*: Fix duplicatedly printed version info with -version

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=452406bd5bbf21a0da7104e6edca9c6e70636511
---

 avconv.c   |    2 +-
 cmdutils.c |    6 +++++-
 cmdutils.h |    2 +-
 ffmpeg.c   |    2 +-
 ffplay.c   |    2 +-
 ffprobe.c  |    2 +-
 ffserver.c |    2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/avconv.c b/avconv.c
index 0fadcc9..77276c1 100644
--- a/avconv.c
+++ b/avconv.c
@@ -4392,7 +4392,7 @@ int main(int argc, char **argv)
     av_register_all();
     avformat_network_init();
 
-    show_banner();
+    show_banner(argc, argv, options);
 
     /* parse options */
     parse_options(&o, argc, argv, options, opt_output_file);
diff --git a/cmdutils.c b/cmdutils.c
index 65628fc..4a5421b 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -582,8 +582,12 @@ static void print_all_libs_info(int flags, int level)
     PRINT_LIB_INFO(postproc, POSTPROC, flags, level);
 }
 
-void show_banner(void)
+void show_banner(int argc, char **argv, const OptionDef *options)
 {
+    int idx = locate_option(argc, argv, options, "version");
+    if (idx)
+        return;
+
     av_log(NULL, AV_LOG_INFO, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",
            program_name, program_birth_year, this_year);
     av_log(NULL, AV_LOG_INFO, "  built on %s %s with %s %s\n",
diff --git a/cmdutils.h b/cmdutils.h
index 03080b5..a682c96 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -245,7 +245,7 @@ void print_error(const char *filename, int err);
  * current version of the repository and of the libav* libraries used by
  * the program.
  */
-void show_banner(void);
+void show_banner(int argc, char **argv, const OptionDef *options);
 
 /**
  * Print the version of the program to stdout. The version message
diff --git a/ffmpeg.c b/ffmpeg.c
index 6ef8c15..75274db 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4857,7 +4857,7 @@ int main(int argc, char **argv)
     av_register_all();
     avformat_network_init();
 
-    show_banner();
+    show_banner(argc, argv, options);
 
     term_init();
 
diff --git a/ffplay.c b/ffplay.c
index b5d9f0f..8734b65 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -3165,7 +3165,7 @@ int main(int argc, char **argv)
 
     init_opts();
 
-    show_banner();
+    show_banner(argc, argv, options);
 
     parse_options(NULL, argc, argv, options, opt_input_file);
 
diff --git a/ffprobe.c b/ffprobe.c
index 577fed3..71f7ded 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1252,7 +1252,7 @@ int main(int argc, char **argv)
     avdevice_register_all();
 #endif
 
-    show_banner();
+    show_banner(argc, argv, options);
     parse_options(NULL, argc, argv, options, opt_input_file);
 
     if (!input_filename) {
diff --git a/ffserver.c b/ffserver.c
index 0a4f889..4a9cc62 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4673,7 +4673,7 @@ int main(int argc, char **argv)
     av_register_all();
     avformat_network_init();
 
-    show_banner();
+    show_banner(argc, argv, options);
 
     my_program_name = argv[0];
     my_program_dir = getcwd(0, 0);