har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmdutils: add print_program_info() used in both show_banner() and show_version()

Browse Source 
This also make -version show program configuration and compilation
information, which was previously shown only in the banner.
This commit is contained in:
Stefano Sabatini 2012-01-01 16:42:35 +01:00
parent 3edff185ab
commit 9ac58ba133
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmdutils.c
View File

@ -569,6 +569,7 @@ static int warned_cfg = 0;
#define INDENT 1 #define INDENT 1
#define SHOW_VERSION 2 #define SHOW_VERSION 2
#define SHOW_CONFIG 4 #define SHOW_CONFIG 4
#define SHOW_COPYRIGHT 8
#define PRINT_LIB_INFO(libname, LIBNAME, flags, level) \ #define PRINT_LIB_INFO(libname, LIBNAME, flags, level) \
if (CONFIG_##LIBNAME) { \ if (CONFIG_##LIBNAME) { \
@ -609,25 +610,34 @@ static void print_all_libs_info(int flags, int level)
PRINT_LIB_INFO(postproc, POSTPROC, flags, level); PRINT_LIB_INFO(postproc, POSTPROC, flags, level);
} }
static void print_program_info(int flags, int level)
{
const char *indent = flags & INDENT? " " : "";
av_log(NULL, level, "%s version " FFMPEG_VERSION, program_name);
if (flags & SHOW_COPYRIGHT)
av_log(NULL, level, " Copyright (c) %d-%d the FFmpeg developers",
program_birth_year, this_year);
av_log(NULL, level, "\n");
av_log(NULL, level, "%sbuilt on %s %s with %s %s\n",
indent, __DATE__, __TIME__, CC_TYPE, CC_VERSION);
av_log(NULL, level, "%sconfiguration: " FFMPEG_CONFIGURATION "\n", indent);
}
void show_banner(int argc, char **argv, const OptionDef *options) void show_banner(int argc, char **argv, const OptionDef *options)
{ {
int idx = locate_option(argc, argv, options, "version"); int idx = locate_option(argc, argv, options, "version");
if (idx) if (idx)
return; return;
av_log(NULL, AV_LOG_INFO, print_program_info (INDENT|SHOW_COPYRIGHT, 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",
__DATE__, __TIME__, CC_TYPE, CC_VERSION);
av_log(NULL, AV_LOG_INFO, " configuration: " FFMPEG_CONFIGURATION "\n");
print_all_libs_info(INDENT|SHOW_CONFIG, AV_LOG_INFO); print_all_libs_info(INDENT|SHOW_CONFIG, AV_LOG_INFO);
print_all_libs_info(INDENT|SHOW_VERSION, AV_LOG_INFO); print_all_libs_info(INDENT|SHOW_VERSION, AV_LOG_INFO);
} }
int opt_version(const char *opt, const char *arg) { int opt_version(const char *opt, const char *arg) {
av_log_set_callback(log_callback_help); av_log_set_callback(log_callback_help);
printf("%s " FFMPEG_VERSION "\n", program_name); print_program_info (0 , AV_LOG_INFO);
print_all_libs_info(SHOW_VERSION, AV_LOG_INFO); print_all_libs_info(SHOW_VERSION, AV_LOG_INFO);
return 0; return 0;
} }