Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"

This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.
This commit is contained in:
Michael Niedermayer
2011-03-17 17:01:10 +01:00
parent 0cb88628fb
commit e528cdac8a
10 changed files with 21 additions and 21 deletions

View File

@ -399,7 +399,7 @@ static int warned_cfg = 0;
} \
if (flags & SHOW_CONFIG) { \
const char *cfg = libname##_configuration(); \
if (strcmp(LIBAV_CONFIGURATION, cfg)) { \
if (strcmp(FFMPEG_CONFIGURATION, cfg)) { \
if (!warned_cfg) { \
fprintf(outstream, \
"%sWARNING: library configuration mismatch\n", \
@ -429,7 +429,7 @@ void show_banner(void)
program_name, program_birth_year, this_year);
fprintf(stderr, " built on %s %s with %s %s\n",
__DATE__, __TIME__, CC_TYPE, CC_VERSION);
fprintf(stderr, " configuration: " LIBAV_CONFIGURATION "\n");
fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n");
print_all_libs_info(stderr, INDENT|SHOW_CONFIG);
print_all_libs_info(stderr, INDENT|SHOW_VERSION);
}