Commit f25fc9b1 authored by Måns Rullgård's avatar Måns Rullgård

indentation

Originally committed as revision 5447 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1ea46bed
...@@ -932,12 +932,12 @@ check_header altivec.h && _altivec_h=yes || _altivec_h=no ...@@ -932,12 +932,12 @@ check_header altivec.h && _altivec_h=yes || _altivec_h=no
# check if our compiler supports Motorola AltiVec C API # check if our compiler supports Motorola AltiVec C API
if test $altivec = "yes"; then if test $altivec = "yes"; then
if test $_altivec_h = "yes"; then if test $_altivec_h = "yes"; then
inc_altivec_h="#include <altivec.h>" inc_altivec_h="#include <altivec.h>"
else else
inc_altivec_h= inc_altivec_h=
fi fi
check_cc <<EOF || altivec=no check_cc <<EOF || altivec=no
$inc_altivec_h $inc_altivec_h
int main(void) { int main(void) {
vector signed int v1, v2, v3; vector signed int v1, v2, v3;
...@@ -958,7 +958,7 @@ fi ...@@ -958,7 +958,7 @@ fi
# check if our compiler supports mmi # check if our compiler supports mmi
if test $mmi = "yes"; then if test $mmi = "yes"; then
check_cc <<EOF || mmi="no" check_cc <<EOF || mmi="no"
int main(void) { int main(void) {
__asm__ ("lq \$2, 0(\$2)"); __asm__ ("lq \$2, 0(\$2)");
return 0; return 0;
...@@ -984,9 +984,9 @@ EOF ...@@ -984,9 +984,9 @@ EOF
dc1394="no" dc1394="no"
ffserver="no" ffserver="no"
network="no" network="no"
if test "$mingwce" = "yes"; then if test "$mingwce" = "yes"; then
protocols="no" protocols="no"
fi fi
SLIBPREF="" SLIBPREF=""
SLIBSUF=".dll" SLIBSUF=".dll"
EXESUF=".exe" EXESUF=".exe"
...@@ -995,10 +995,9 @@ fi ...@@ -995,10 +995,9 @@ fi
fi fi
if test -z "$cross_prefix" ; then if test -z "$cross_prefix" ; then
# ---
# --- # big/little-endian test
# big/little-endian test check_ld <<EOF
check_ld <<EOF
#include <inttypes.h> #include <inttypes.h>
int main(int argc, char ** argv){ int main(int argc, char ** argv){
volatile uint32_t i=0x01234567; volatile uint32_t i=0x01234567;
...@@ -1006,19 +1005,16 @@ int main(int argc, char ** argv){ ...@@ -1006,19 +1005,16 @@ int main(int argc, char ** argv){
} }
EOF EOF
if test $? = 0 ; then if test $? = 0 ; then
$TMPE && bigendian="yes" $TMPE && bigendian="yes"
else else
echo big/little test failed echo big/little test failed
fi fi
else else
# programs cannot be launched if cross compiling, so make a static guess
# programs cannot be launched if cross compiling, so make a static guess if test "$cpu" = "powerpc" -o "$cpu" = "mips" ; then
if test "$cpu" = "powerpc" -o "$cpu" = "mips" ; then
bigendian="yes" bigendian="yes"
fi fi
fi fi
# --- # ---
...@@ -1135,7 +1131,7 @@ if check_func dlopen; then ...@@ -1135,7 +1131,7 @@ if check_func dlopen; then
ldl= ldl=
fi fi
if test "$vhook" = "default" ; then if test "$vhook" = "default"; then
vhook="$dlopen" vhook="$dlopen"
fi fi
...@@ -1233,7 +1229,7 @@ EOF ...@@ -1233,7 +1229,7 @@ EOF
check_cflags -Wall check_cflags -Wall
check_cflags -Wno-switch check_cflags -Wno-switch
if test "$sdl" = "no" ; then if test "$sdl" = "no"; then
ffplay=no ffplay=no
fi fi
...@@ -1266,19 +1262,19 @@ if test "$lshared" = "yes" ; then ...@@ -1266,19 +1262,19 @@ if test "$lshared" = "yes" ; then
fi fi
if test x"$bindir" = x""; then if test x"$bindir" = x""; then
bindir="${prefix}/bin" bindir="${prefix}/bin"
fi fi
if test x"$libdir" = x""; then if test x"$libdir" = x""; then
libdir="${prefix}/lib" libdir="${prefix}/lib"
fi fi
if test x"$incdir" = x""; then if test x"$incdir" = x""; then
incdir="${prefix}/include/ffmpeg" incdir="${prefix}/include/ffmpeg"
fi fi
if test x"$mandir" = x""; then if test x"$mandir" = x""; then
mandir="${prefix}/man" mandir="${prefix}/man"
fi fi
echo "install prefix $prefix" echo "install prefix $prefix"
...@@ -1287,24 +1283,24 @@ echo "C compiler $cc" ...@@ -1287,24 +1283,24 @@ echo "C compiler $cc"
echo "make $make" echo "make $make"
echo "CPU $cpu ($tune)" echo "CPU $cpu ($tune)"
if test "$BUILDSUF" != ""; then if test "$BUILDSUF" != ""; then
echo "build suffix $BUILDSUF" echo "build suffix $BUILDSUF"
fi fi
echo "big-endian $bigendian" echo "big-endian $bigendian"
echo "inttypes.h $inttypes" echo "inttypes.h $inttypes"
echo "broken inttypes.h $emu_fast_int" echo "broken inttypes.h $emu_fast_int"
if test $cpu = "x86" -o $cpu = "x86_64"; then if test $cpu = "x86" -o $cpu = "x86_64"; then
echo "MMX enabled $mmx" echo "MMX enabled $mmx"
echo "Vector Builtins $builtin_vector" echo "Vector Builtins $builtin_vector"
echo "3DNow! Builtins $mm3dnow" echo "3DNow! Builtins $mm3dnow"
fi fi
if test $cpu = "armv4l"; then if test $cpu = "armv4l"; then
echo "IWMMXT enabled $iwmmxt" echo "IWMMXT enabled $iwmmxt"
fi fi
if test $cpu = "mips"; then if test $cpu = "mips"; then
echo "MMI enabled $mmi" echo "MMI enabled $mmi"
fi fi
if test $cpu = "powerpc"; then if test $cpu = "powerpc"; then
echo "AltiVec enabled $altivec" echo "AltiVec enabled $altivec"
fi fi
echo "gprof enabled $gprof" echo "gprof enabled $gprof"
echo "zlib enabled $zlib" echo "zlib enabled $zlib"
...@@ -1331,12 +1327,12 @@ echo "shared $lshared" ...@@ -1331,12 +1327,12 @@ echo "shared $lshared"
echo "video hooking $vhook" echo "video hooking $vhook"
echo "SDL support $sdl" echo "SDL support $sdl"
if test $sdl_too_old = "yes"; then if test $sdl_too_old = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support." echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support."
fi fi
if test "$vhook" = "yes" ; then if test "$vhook" = "yes"; then
echo "Imlib2 support $imlib2" echo "Imlib2 support $imlib2"
echo "FreeType support $freetype2" echo "FreeType support $freetype2"
fi fi
echo "Sun medialib support" $sunmlib echo "Sun medialib support" $sunmlib
echo "pthreads support" $pthreads echo "pthreads support" $pthreads
...@@ -1346,12 +1342,12 @@ echo "AMR-WB float support" $amr_wb ...@@ -1346,12 +1342,12 @@ echo "AMR-WB float support" $amr_wb
echo "AMR-WB IF2 support" $amr_if2 echo "AMR-WB IF2 support" $amr_if2
echo "network support $network" echo "network support $network"
if test "$network" = "yes" ; then if test "$network" = "yes" ; then
echo "IPv6 support $ipv6" echo "IPv6 support $ipv6"
fi fi
if test "$gpl" = "no" ; then if test "$gpl" = "no" ; then
echo "License: LGPL" echo "License: LGPL"
else else
echo "License: GPL" echo "License: GPL"
fi fi
echo "Creating config.mak and config.h..." echo "Creating config.mak and config.h..."
...@@ -1372,11 +1368,11 @@ echo "CC=$cc" >> config.mak ...@@ -1372,11 +1368,11 @@ echo "CC=$cc" >> config.mak
echo "AR=$ar" >> config.mak echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak echo "RANLIB=$ranlib" >> config.mak
if test "$dostrip" = "yes" ; then if test "$dostrip" = "yes" ; then
echo "STRIP=$strip" >> config.mak echo "STRIP=$strip" >> config.mak
echo "INSTALLSTRIP=$installstrip" >> config.mak echo "INSTALLSTRIP=$installstrip" >> config.mak
else else
echo "STRIP=echo ignoring strip" >> config.mak echo "STRIP=echo ignoring strip" >> config.mak
echo "INSTALLSTRIP=" >> config.mak echo "INSTALLSTRIP=" >> config.mak
fi fi
# SHCFLAGS is a copy of CFLAGS without -mdynamic-no-pic, used when building # SHCFLAGS is a copy of CFLAGS without -mdynamic-no-pic, used when building
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment