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

1 files changed, 10 insertions, 0 deletions

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