diff --git a/avconv.c b/avconv.c index 4c99a6fdd7..10e99ff67a 100644 --- a/avconv.c +++ b/avconv.c @@ -4361,7 +4361,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 65628fcc86..4a5421b770 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 15f983643a..3aad0174d2 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 f126a6a719..f80c6c8a8c 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -4837,7 +4837,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 947a84b06c..f0861a8091 100644 --- a/ffplay.c +++ b/ffplay.c @@ -3177,7 +3177,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 6af76953aa..a2aaeb295f 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 1244b45b90..c1593500be 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4674,7 +4674,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);