Merge remote-tracking branch 'qatar/master'

* qatar/master:
  yuv4mpeg: reject unsupported codecs
  nutenc: K&R formatting cosmetics
  assdec: fix qsort() callback signature
  configure: detect sparc64 automatically
  vp8: fix memset() crossing array boundary
  h264: fix invalid pointer arithmetic
  amrwbdec: fix invalid pointer arithmetic

Conflicts:
	libavformat/nutenc.c
	libavformat/yuv4mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 6 insertions, 3 deletions

diff --git a/configure b/configure
index 7f9fe4f0b7..b1280f9865 100755
--- a/configure
+++ b/configure
@@ -2745,9 +2745,8 @@ case "$arch" in
     sh4|sh)
         arch="sh4"
     ;;
-    sun4u|sparc64)
+    sun4u|sparc*)
         arch="sparc"
-        subarch="sparc64"
     ;;
     tilegx|tile-gx)
         arch="tilegx"
@@ -2965,7 +2964,7 @@ check_64bit(){
 }
 
 case "$arch" in
-    alpha|ia64|sparc)
+    alpha|ia64)
         spic=$shared
     ;;
     mips)
@@ -2979,6 +2978,10 @@ case "$arch" in
     ppc)
         check_64bit ppc ppc64 'sizeof(void *) > 4'
     ;;
+    sparc)
+        check_64bit sparc sparc64 'sizeof(void *) > 4'
+        spic=$shared
+    ;;
     x86)
         check_64bit x86_32 x86_64 'sizeof(void *) > 4'
         if test "$subarch" = "x86_64"; then