Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Add support for Tilera processors
  wavdec: check size before reading the data, not after.

Conflicts:
	configure

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

1 files changed, 5 insertions, 0 deletions

diff --git a/configure b/configure
index a1cc82d5b0..0a63aaf54a 100755
--- a/configure
+++ b/configure
@@ -1211,6 +1211,8 @@ ARCH_LIST='
     sh4
     sparc
     sparc64
+    tilegx
+    tilepro
     tomi
     x86
     x86_32
@@ -2796,6 +2798,9 @@ case "$arch" in
         arch="sparc"
         subarch="sparc64"
     ;;
+    tilegx|tile-gx)
+        arch="tilegx"
+    ;;
     i[3-6]86|i86pc|BePC|x86pc|x86_64|x86_32|amd64)
         arch="x86"
     ;;