RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get rid of ifdeffery for printing library versions and configurations 

Originally committed as revision 21476 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-01-27 12:58:22 +00:00
parent dc4f5a1c3a
commit 58fe804a5a
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmdutils.c
View File

@ -325,10 +325,12 @@ void print_error(const char *filename, int err)
} }
#define PRINT_LIB_VERSION(outstream,libname,LIBNAME,indent) \ #define PRINT_LIB_VERSION(outstream,libname,LIBNAME,indent) \
if (CONFIG_##LIBNAME) { \
version= libname##_version(); \ version= libname##_version(); \
fprintf(outstream, "%slib%-10s %2d.%2d.%2d / %2d.%2d.%2d\n", indent? " " : "", #libname, \ fprintf(outstream, "%slib%-10s %2d.%2d.%2d / %2d.%2d.%2d\n", indent? " " : "", #libname, \
LIB##LIBNAME##_VERSION_MAJOR, LIB##LIBNAME##_VERSION_MINOR, LIB##LIBNAME##_VERSION_MICRO, \ LIB##LIBNAME##_VERSION_MAJOR, LIB##LIBNAME##_VERSION_MINOR, LIB##LIBNAME##_VERSION_MICRO, \
version >> 16, version >> 8 & 0xff, version & 0xff); version >> 16, version >> 8 & 0xff, version & 0xff); \
}
static void print_all_lib_versions(FILE* outstream, int indent) static void print_all_lib_versions(FILE* outstream, int indent)
{ {
@ -337,13 +339,9 @@ static void print_all_lib_versions(FILE* outstream, int indent)
PRINT_LIB_VERSION(outstream, avcodec, AVCODEC, indent); PRINT_LIB_VERSION(outstream, avcodec, AVCODEC, indent);
PRINT_LIB_VERSION(outstream, avformat, AVFORMAT, indent); PRINT_LIB_VERSION(outstream, avformat, AVFORMAT, indent);
PRINT_LIB_VERSION(outstream, avdevice, AVDEVICE, indent); PRINT_LIB_VERSION(outstream, avdevice, AVDEVICE, indent);
#if CONFIG_AVFILTER
PRINT_LIB_VERSION(outstream, avfilter, AVFILTER, indent); PRINT_LIB_VERSION(outstream, avfilter, AVFILTER, indent);
#endif
PRINT_LIB_VERSION(outstream, swscale, SWSCALE, indent); PRINT_LIB_VERSION(outstream, swscale, SWSCALE, indent);
#if CONFIG_POSTPROC
PRINT_LIB_VERSION(outstream, postproc, POSTPROC, indent); PRINT_LIB_VERSION(outstream, postproc, POSTPROC, indent);
#endif
} }
static void maybe_print_config(const char *lib, const char *cfg) static void maybe_print_config(const char *lib, const char *cfg)
@ -359,6 +357,11 @@ static void maybe_print_config(const char *lib, const char *cfg)
} }
} }
#define PRINT_LIB_CONFIG(lib, tag, cfg) do { \
if (CONFIG_##lib) \
maybe_print_config(tag, cfg); \
} while (0)
void show_banner(void) void show_banner(void)
{ {
fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d Fabrice Bellard, et al.\n", fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d Fabrice Bellard, et al.\n",
@ -366,17 +369,13 @@ void show_banner(void)
fprintf(stderr, " built on %s %s with %s %s\n", fprintf(stderr, " built on %s %s with %s %s\n",
__DATE__, __TIME__, CC_TYPE, CC_VERSION); __DATE__, __TIME__, CC_TYPE, CC_VERSION);
fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n");
maybe_print_config("libavutil", avutil_configuration()); PRINT_LIB_CONFIG(AVUTIL, "libavutil", avutil_configuration());
maybe_print_config("libavcodec", avcodec_configuration()); PRINT_LIB_CONFIG(AVCODEC, "libavcodec", avcodec_configuration());
maybe_print_config("libavformat", avformat_configuration()); PRINT_LIB_CONFIG(AVFORMAT, "libavformat", avformat_configuration());
maybe_print_config("libavdevice", avdevice_configuration()); PRINT_LIB_CONFIG(AVDEVICE, "libavdevice", avdevice_configuration());
#if CONFIG_AVFILTER PRINT_LIB_CONFIG(AVFILTER, "libavfilter", avfilter_configuration());
maybe_print_config("libavfilter", avfilter_configuration()); PRINT_LIB_CONFIG(SWSCALE, "libswscale", swscale_configuration());
#endif PRINT_LIB_CONFIG(POSTPROC, "libpostproc", postproc_configuration());
maybe_print_config("libswscale", swscale_configuration());
#if CONFIG_POSTPROC
maybe_print_config("libpostproc", postproc_configuration());
#endif
print_all_lib_versions(stderr, 1); print_all_lib_versions(stderr, 1);
} }