ff*: Fix duplicatedly printed version info with -version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-20 22:03:25 +01:00
parent b0aaf304a7
commit 452406bd5b
7 changed files with 11 additions and 7 deletions

View File

@ -4392,7 +4392,7 @@ int main(int argc, char **argv)
av_register_all(); av_register_all();
avformat_network_init(); avformat_network_init();
show_banner(); show_banner(argc, argv, options);
/* parse options */ /* parse options */
parse_options(&o, argc, argv, options, opt_output_file); parse_options(&o, argc, argv, options, opt_output_file);

View File

@ -582,8 +582,12 @@ static void print_all_libs_info(int flags, int level)
PRINT_LIB_INFO(postproc, POSTPROC, flags, 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", 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); program_name, program_birth_year, this_year);
av_log(NULL, AV_LOG_INFO, " built on %s %s with %s %s\n", av_log(NULL, AV_LOG_INFO, " built on %s %s with %s %s\n",

View File

@ -245,7 +245,7 @@ void print_error(const char *filename, int err);
* current version of the repository and of the libav* libraries used by * current version of the repository and of the libav* libraries used by
* the program. * 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 * Print the version of the program to stdout. The version message

View File

@ -4857,7 +4857,7 @@ int main(int argc, char **argv)
av_register_all(); av_register_all();
avformat_network_init(); avformat_network_init();
show_banner(); show_banner(argc, argv, options);
term_init(); term_init();

View File

@ -3165,7 +3165,7 @@ int main(int argc, char **argv)
init_opts(); init_opts();
show_banner(); show_banner(argc, argv, options);
parse_options(NULL, argc, argv, options, opt_input_file); parse_options(NULL, argc, argv, options, opt_input_file);

View File

@ -1252,7 +1252,7 @@ int main(int argc, char **argv)
avdevice_register_all(); avdevice_register_all();
#endif #endif
show_banner(); show_banner(argc, argv, options);
parse_options(NULL, argc, argv, options, opt_input_file); parse_options(NULL, argc, argv, options, opt_input_file);
if (!input_filename) { if (!input_filename) {

View File

@ -4673,7 +4673,7 @@ int main(int argc, char **argv)
av_register_all(); av_register_all();
avformat_network_init(); avformat_network_init();
show_banner(); show_banner(argc, argv, options);
my_program_name = argv[0]; my_program_name = argv[0];
my_program_dir = getcwd(0, 0); my_program_dir = getcwd(0, 0);