[FFmpeg-cvslog] replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
Janne Grunau
git at videolan.org
Thu Mar 17 17:49:21 CET 2011
ffmpeg | branch: master | Janne Grunau <janne-ffmpeg at jannau.net> | Mon Mar 14 22:23:10 2011 +0100| [29ba091136a5e04574f7bfc1b17536c923958f6f] | committer: Janne Grunau
replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=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 ad1f737..1ec4436 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ distclean::
$(RM) version.h config.* libavutil/avconfig.h
config:
- $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
+ $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
# regression tests
diff --git a/cmdutils.c b/cmdutils.c
index 514ebad..7012d04 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);
}
diff --git a/configure b/configure
index 36b9e8a..3dba452 100755
--- a/configure
+++ b/configure
@@ -1688,7 +1688,7 @@ for v in "$@"; do
r=${v#*=}
l=${v%"$r"}
r=$(sh_quote "$r")
- FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}"
+ LIBAV_CONFIGURATION="${LIBAV_CONFIGURATION# } ${l}${r}"
done
find_things(){
@@ -1800,7 +1800,7 @@ done
disabled logging && logfile=/dev/null
-echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
+echo "# $0 $LIBAV_CONFIGURATION" > $logfile
set >> $logfile
test -n "$cross_prefix" && enable cross_compile
@@ -2495,7 +2495,7 @@ case $target_os in
;;
esac
-echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$FFMPEG_CONFIGURATION" >config.fate
+echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$LIBAV_CONFIGURATION" >config.fate
check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
@@ -3204,9 +3204,9 @@ config_files="$TMPH config.mak"
cat > config.mak <<EOF
# Automatically generated by configure - do not modify!
-ifndef FFMPEG_CONFIG_MAK
-FFMPEG_CONFIG_MAK=1
-FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
+ifndef LIBAV_CONFIG_MAK
+LIBAV_CONFIG_MAK=1
+LIBAV_CONFIGURATION=$LIBAV_CONFIGURATION
prefix=$prefix
LIBDIR=\$(DESTDIR)$libdir
SHLIBDIR=\$(DESTDIR)$shlibdir
@@ -3295,9 +3295,9 @@ get_version LIBAVFILTER libavfilter/avfilter.h
cat > $TMPH <<EOF
/* Automatically generated by configure - do not modify! */
-#ifndef FFMPEG_CONFIG_H
-#define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
+#ifndef LIBAV_CONFIG_H
+#define LIBAV_CONFIG_H
+#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
#define FFMPEG_LICENSE "$(c_escape $license)"
#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
#define CC_TYPE "$cc_type"
@@ -3349,8 +3349,8 @@ LAVFI_TESTS=$(print_enabled -n _test $LAVFI_TESTS)
SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS)
EOF
-echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
-echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
+echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH
+echo "endif # LIBAV_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 18631ff..be9c912 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1035,7 +1035,7 @@ unsigned avcodec_version( void )
const char *avcodec_configuration(void)
{
- return FFMPEG_CONFIGURATION;
+ return LIBAV_CONFIGURATION;
}
const char *avcodec_license(void)
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 3d67b4b..01db877 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -25,7 +25,7 @@ unsigned avdevice_version(void)
const char * avdevice_configuration(void)
{
- return FFMPEG_CONFIGURATION;
+ return LIBAV_CONFIGURATION;
}
const char * avdevice_license(void)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 039e04b..c0ead5c 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -34,7 +34,7 @@ unsigned avfilter_version(void) {
const char *avfilter_configuration(void)
{
- return FFMPEG_CONFIGURATION;
+ return LIBAV_CONFIGURATION;
}
const char *avfilter_license(void)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1dfaa3c..2f1db44 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -51,7 +51,7 @@ unsigned avformat_version(void)
const char *avformat_configuration(void)
{
- return FFMPEG_CONFIGURATION;
+ return LIBAV_CONFIGURATION;
}
const char *avformat_license(void)
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 8a1d32e..488bac4 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -31,7 +31,7 @@ unsigned avutil_version(void)
const char *avutil_configuration(void)
{
- return FFMPEG_CONFIGURATION;
+ return LIBAV_CONFIGURATION;
}
const char *avutil_license(void)
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 92c822b..7466b18 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -94,7 +94,7 @@ unsigned postproc_version(void)
const char *postproc_configuration(void)
{
- return FFMPEG_CONFIGURATION;
+ return LIBAV_CONFIGURATION;
}
const char *postproc_license(void)
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 166e983..34988a0 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -53,7 +53,7 @@ unsigned swscale_version(void)
const char *swscale_configuration(void)
{
- return FFMPEG_CONFIGURATION;
+ return LIBAV_CONFIGURATION;
}
const char *swscale_license(void)
More information about the ffmpeg-cvslog
mailing list