Fix compilation after FFmpeg r22569 at least for some architectures.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30916 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
cehoyos 2010-03-17 10:46:18 +00:00
parent 43ccbad38c
commit 8e8387f7bd
1 changed files with 10 additions and 0 deletions

10
configure vendored
View File

@ -1769,6 +1769,7 @@ arch_all='X86 X86_32 X86_64 IA64 SPARC ARM AVR32 SH4 PPC PPC64 ALPHA MIPS SGI_MI
case "$host_arch" in case "$host_arch" in
i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
arch='X86 X86_32' arch='X86 X86_32'
libavcodec_arch="x86"
target_arch="ARCH_X86 = yes" target_arch="ARCH_X86 = yes"
target_subarch="ARCH_X86_32 = yes" target_subarch="ARCH_X86_32 = yes"
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
@ -2017,6 +2018,7 @@ EOF
x86_64|amd64) x86_64|amd64)
arch='X86 X86_64' arch='X86 X86_64'
libavcodec_arch="x86"
target_subarch='ARCH_X86_64 = yes' target_subarch='ARCH_X86_64 = yes'
target_arch="ARCH_X86 = yes" target_arch="ARCH_X86 = yes"
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
@ -2112,6 +2114,7 @@ EOF
sparc|sparc64) sparc|sparc64)
arch='SPARC' arch='SPARC'
libavcodec_arch="sparc"
target_arch='ARCH_SPARC = yes' target_arch='ARCH_SPARC = yes'
iproc='sparc' iproc='sparc'
if test "$host_arch" = "sparc64" ; then if test "$host_arch" = "sparc64" ; then
@ -2140,12 +2143,14 @@ EOF
arm*) arm*)
arch='ARM' arch='ARM'
libavcodec_arch="arm"
target_arch='ARCH_ARM = yes' target_arch='ARCH_ARM = yes'
iproc='arm' iproc='arm'
;; ;;
avr32) avr32)
arch='AVR32' arch='AVR32'
libavcodec_arch="avr32"
target_arch='ARCH_AVR32 = yes' target_arch='ARCH_AVR32 = yes'
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
iproc='avr32' iproc='avr32'
@ -2154,6 +2159,7 @@ EOF
sh|sh4) sh|sh4)
arch='SH4' arch='SH4'
libavcodec_arch="sh4"
target_arch='ARCH_SH4 = yes' target_arch='ARCH_SH4 = yes'
iproc='sh4' iproc='sh4'
;; ;;
@ -2161,6 +2167,7 @@ EOF
ppc|ppc64|powerpc|powerpc64) ppc|ppc64|powerpc|powerpc64)
arch='PPC' arch='PPC'
def_dcbzl='#define HAVE_DCBZL 0' def_dcbzl='#define HAVE_DCBZL 0'
libavcodec_arch="ppc"
target_arch='ARCH_PPC = yes' target_arch='ARCH_PPC = yes'
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
@ -2278,6 +2285,7 @@ EOF
alpha*) alpha*)
arch='ALPHA' arch='ALPHA'
libavcodec_arch="alpha"
target_arch='ARCH_ALPHA = yes' target_arch='ARCH_ALPHA = yes'
iproc='alpha' iproc='alpha'
@ -2321,6 +2329,7 @@ EOF
mips) mips)
arch='SGI_MIPS' arch='SGI_MIPS'
libavcodec_arch="mips"
target_arch='ARCH_SGI_MIPS = yes' target_arch='ARCH_SGI_MIPS = yes'
iproc='sgi-mips' iproc='sgi-mips'
@ -8489,6 +8498,7 @@ EXESUF = $_exesuf
EXESUFS_ALL = .exe EXESUFS_ALL = .exe
$target_arch $target_arch
ARCH = $libavcodec_arch
$target_subarch $target_subarch
$(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/') $(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/')