|
@@ -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
|