Declare variable "version" in the PRINT_LIB_VERSION() macro if block,

slightly simpler and more robust.

Originally committed as revision 21492 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-01-27 23:08:43 +00:00
parent 39c6b3f54c
commit 695f7de6a4
1 changed files with 1 additions and 2 deletions

View File

@ -326,7 +326,7 @@ 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) { \ if (CONFIG_##LIBNAME) { \
version= libname##_version(); \ unsigned int version = libname##_version(); \
fprintf(outstream, "%slib%-10s %2d.%2d.%2d / %2d.%2d.%2d\n", \ fprintf(outstream, "%slib%-10s %2d.%2d.%2d / %2d.%2d.%2d\n", \
indent? " " : "", #libname, \ indent? " " : "", #libname, \
LIB##LIBNAME##_VERSION_MAJOR, \ LIB##LIBNAME##_VERSION_MAJOR, \
@ -337,7 +337,6 @@ void print_error(const char *filename, int err)
static void print_all_lib_versions(FILE* outstream, int indent) static void print_all_lib_versions(FILE* outstream, int indent)
{ {
unsigned int version;
PRINT_LIB_VERSION(outstream, avutil, AVUTIL, indent); PRINT_LIB_VERSION(outstream, avutil, AVUTIL, 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);