instead of directly printing to stderr, use the av_log framework. Also,
lower the warning about library configuration mismatch to not be shown
by default.
---
cmdutils.c | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/cmdutils.c b/cmdutils.c
index 6901f56..6ac2839 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -383,12 +383,13 @@ static int warned_cfg = 0;
#define SHOW_VERSION 2
#define SHOW_CONFIG 4
-#define PRINT_LIB_INFO(outstream,libname,LIBNAME,flags) \
+#define PRINT_LIB_INFO(libname,LIBNAME,flags) \
if (CONFIG_##LIBNAME) { \
const char *indent = flags & INDENT? " " : ""; \
if (flags & SHOW_VERSION) { \
unsigned int version = libname##_version(); \
- fprintf(outstream, "%slib%-9s %2d.%3d.%2d / %2d.%3d.%2d\n", \
+ av_log(NULL, AV_LOG_INFO, \
+ "%slib%-9s %2d.%3d.%2d / %2d.%3d.%2d\n", \
indent, #libname, \
LIB##LIBNAME##_VERSION_MAJOR, \
LIB##LIBNAME##_VERSION_MINOR, \
@@ -399,26 +400,27 @@ static int warned_cfg = 0;
const char *cfg = libname##_configuration(); \
if (strcmp(LIBAV_CONFIGURATION, cfg)) { \
if (!warned_cfg) { \
- fprintf(outstream, \
+ av_log(NULL, AV_LOG_VERBOSE, \
"%sWARNING: library configuration mismatch\n", \
indent); \
warned_cfg = 1; \
} \
- fprintf(stderr, "%s%-11s configuration: %s\n", \
+ av_log(NULL, AV_LOG_INFO, \
+ "%s%-11s configuration: %s\n", \
indent, #libname, cfg); \
} \
} \
} \
-static void print_all_libs_info(FILE* outstream, int flags)
+static void print_all_libs_info(int flags)
{
- PRINT_LIB_INFO(outstream, avutil, AVUTIL, flags);
- PRINT_LIB_INFO(outstream, avcodec, AVCODEC, flags);
- PRINT_LIB_INFO(outstream, avformat, AVFORMAT, flags);
- PRINT_LIB_INFO(outstream, avdevice, AVDEVICE, flags);
- PRINT_LIB_INFO(outstream, avfilter, AVFILTER, flags);
- PRINT_LIB_INFO(outstream, swscale, SWSCALE, flags);
- PRINT_LIB_INFO(outstream, postproc, POSTPROC, flags);
+ PRINT_LIB_INFO(avutil, AVUTIL, flags);
+ PRINT_LIB_INFO(avcodec, AVCODEC, flags);
+ PRINT_LIB_INFO(avformat, AVFORMAT, flags);
+ PRINT_LIB_INFO(avdevice, AVDEVICE, flags);
+ PRINT_LIB_INFO(avfilter, AVFILTER, flags);
+ PRINT_LIB_INFO(swscale, SWSCALE, flags);
+ PRINT_LIB_INFO(postproc, POSTPROC, flags);
}
void show_banner(void)
@@ -428,13 +430,13 @@ void show_banner(void)
fprintf(stderr, " built on %s %s with %s %s\n",
__DATE__, __TIME__, CC_TYPE, CC_VERSION);
fprintf(stderr, " configuration: " LIBAV_CONFIGURATION "\n");
- print_all_libs_info(stderr, INDENT|SHOW_CONFIG);
- print_all_libs_info(stderr, INDENT|SHOW_VERSION);
+ print_all_libs_info(INDENT|SHOW_CONFIG);
+ print_all_libs_info(INDENT|SHOW_VERSION);
}
void show_version(void) {
printf("%s " LIBAV_VERSION "\n", program_name);
- print_all_libs_info(stdout, SHOW_VERSION);
+ print_all_libs_info(SHOW_VERSION);
}
void show_license(void)
--
1.7.2.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
