From e528cdac8a95a5364cdd408412b64dc605a8eba6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Mar 2011 17:01:10 +0100 Subject: [PATCH] Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION" This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f. --- Makefile | 2 +- cmdutils.c | 4 ++-- configure | 22 +++++++++++----------- libavcodec/utils.c | 2 +- libavdevice/avdevice.c | 2 +- libavfilter/avfilter.c | 2 +- libavformat/utils.c | 2 +- libavutil/utils.c | 2 +- libpostproc/postprocess.c | 2 +- libswscale/utils.c | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 1ec443699e..ad1f737ebb 100644 --- a/Makefile +++ b/Makefile @@ -177,7 +177,7 @@ distclean:: $(RM) version.h config.* libavutil/avconfig.h config: - $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION) + $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) # regression tests 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); } diff --git a/configure b/configure index e42a6e8cff..38cd4d154c 100755 --- a/configure +++ b/configure @@ -1672,7 +1672,7 @@ for v in "$@"; do r=${v#*=} l=${v%"$r"} r=$(sh_quote "$r") - LIBAV_CONFIGURATION="${LIBAV_CONFIGURATION# } ${l}${r}" + FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}" done find_things(){ @@ -1784,7 +1784,7 @@ done disabled logging && logfile=/dev/null -echo "# $0 $LIBAV_CONFIGURATION" > $logfile +echo "# $0 $FFMPEG_CONFIGURATION" > $logfile set >> $logfile test -n "$cross_prefix" && enable cross_compile @@ -2479,7 +2479,7 @@ case $target_os in ;; esac -echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$LIBAV_CONFIGURATION" >config.fate +echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$FFMPEG_CONFIGURATION" >config.fate check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic @@ -3202,9 +3202,9 @@ config_files="$TMPH config.mak" cat > config.mak < $TMPH <> $TMPH -echo "endif # LIBAV_CONFIG_MAK" >> config.mak +echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH +echo "endif # FFMPEG_CONFIG_MAK" >> config.mak # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. cp_if_changed $TMPH config.h diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a2b2f51499..40d689e1f6 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1078,7 +1078,7 @@ unsigned avcodec_version( void ) const char *avcodec_configuration(void) { - return LIBAV_CONFIGURATION; + return FFMPEG_CONFIGURATION; } const char *avcodec_license(void) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 01db8776ac..3d67b4b8be 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -25,7 +25,7 @@ unsigned avdevice_version(void) const char * avdevice_configuration(void) { - return LIBAV_CONFIGURATION; + return FFMPEG_CONFIGURATION; } const char * avdevice_license(void) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c0ead5c4be..039e04bf64 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -34,7 +34,7 @@ unsigned avfilter_version(void) { const char *avfilter_configuration(void) { - return LIBAV_CONFIGURATION; + return FFMPEG_CONFIGURATION; } const char *avfilter_license(void) diff --git a/libavformat/utils.c b/libavformat/utils.c index a01046624c..e897c09914 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -54,7 +54,7 @@ unsigned avformat_version(void) const char *avformat_configuration(void) { - return LIBAV_CONFIGURATION; + return FFMPEG_CONFIGURATION; } const char *avformat_license(void) diff --git a/libavutil/utils.c b/libavutil/utils.c index 488bac4cc3..8a1d32e167 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -31,7 +31,7 @@ unsigned avutil_version(void) const char *avutil_configuration(void) { - return LIBAV_CONFIGURATION; + return FFMPEG_CONFIGURATION; } const char *avutil_license(void) diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 7466b18be3..92c822b772 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -94,7 +94,7 @@ unsigned postproc_version(void) const char *postproc_configuration(void) { - return LIBAV_CONFIGURATION; + return FFMPEG_CONFIGURATION; } const char *postproc_license(void) diff --git a/libswscale/utils.c b/libswscale/utils.c index 34988a0c66..166e983477 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -53,7 +53,7 @@ unsigned swscale_version(void) const char *swscale_configuration(void) { - return LIBAV_CONFIGURATION; + return FFMPEG_CONFIGURATION; } const char *swscale_license(void)