From e528cdac8a95a5364cdd408412b64dc605a8eba6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Mar 2011 17:01:10 +0100 Subject: Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION" This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f. --- cmdutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmdutils.c') diff --git a/cmdutils.c b/cmdutils.c index a0a1d59cd9..d44aa9ea08 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -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); } -- cgit v1.2.3