diff options
| author | Janne Grunau <janne-ffmpeg@jannau.net> | 2011-03-14 22:23:10 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-03-16 21:54:39 +0100 |
| commit | 29ba091136a5e04574f7bfc1b17536c923958f6f (patch) | |
| tree | 438e3829b626c8bede80e902b6b062aa93936f3b /cmdutils.c | |
| parent | 070c5d0f3530c16c92b81f3f0de2943410367c00 (diff) | |
| download | ffmpeg-29ba091136a5e04574f7bfc1b17536c923958f6f.tar.gz | |
replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c index 514ebadb6e..7012d04cc5 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -397,7 +397,7 @@ static int warned_cfg = 0; } \ if (flags & SHOW_CONFIG) { \ const char *cfg = libname##_configuration(); \ - if (strcmp(FFMPEG_CONFIGURATION, cfg)) { \ + if (strcmp(LIBAV_CONFIGURATION, cfg)) { \ if (!warned_cfg) { \ fprintf(outstream, \ "%sWARNING: library configuration mismatch\n", \ @@ -427,7 +427,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: " FFMPEG_CONFIGURATION "\n"); + fprintf(stderr, " configuration: " LIBAV_CONFIGURATION "\n"); print_all_libs_info(stderr, INDENT|SHOW_CONFIG); print_all_libs_info(stderr, INDENT|SHOW_VERSION); } |