summaryrefslogtreecommitdiff
path: root/cmdutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-20 22:03:25 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-20 22:23:12 +0100
commit452406bd5bbf21a0da7104e6edca9c6e70636511 (patch)
treeec57dcd3ad61e06d903b8a754384cb9fa769d9e4 /cmdutils.c
parentb0aaf304a778f0a49d42c032aa83efa62c3291c4 (diff)
ff*: Fix duplicatedly printed version info with -version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
-rw-r--r--cmdutils.c6
1 files changed, 5 insertions, 1 deletions
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",