From a43283b6f4cfbf821d12a94270df8a2199599cc9 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 16 Oct 2012 10:37:29 +0200
Subject: [PATCH 1/2] wavdec: check size before reading the data, not after.

---
 libavformat/wavdec.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 9e48531fc8..c9f7abbbcf 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -204,7 +204,7 @@ static int wav_read_header(AVFormatContext *s)
     int64_t size, av_uninit(data_size);
     int64_t sample_count=0;
     int rf64;
-    uint32_t tag, list_type;
+    uint32_t tag;
     AVIOContext *pb = s->pb;
     AVStream *st = NULL;
     WAVDemuxContext *wav = s->priv_data;
@@ -287,12 +287,11 @@ static int wav_read_header(AVFormatContext *s)
                 return ret;
             break;
         case MKTAG('L', 'I', 'S', 'T'):
-            list_type = avio_rl32(pb);
             if (size < 4) {
                 av_log(s, AV_LOG_ERROR, "too short LIST");
                 return AVERROR_INVALIDDATA;
             }
-            switch (list_type) {
+            switch (avio_rl32(pb)) {
             case MKTAG('I', 'N', 'F', 'O'):
                 if ((ret = ff_read_riff_info(s, size - 4)) < 0)
                     return ret;

From c75848cd4c0961f8cfa9dbbce6c8c12641aa5124 Mon Sep 17 00:00:00 2001
From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Tue, 16 Oct 2012 18:21:06 +0000
Subject: [PATCH 2/2] configure: Add support for Tilera processors

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 configure | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure b/configure
index 5240a7cbbe..75468d9755 100755
--- a/configure
+++ b/configure
@@ -1077,6 +1077,8 @@ ARCH_LIST='
     sh4
     sparc
     sparc64
+    tilegx
+    tilepro
     tomi
     x86
     x86_32
@@ -2520,6 +2522,9 @@ case "$arch" in
         arch="sparc"
         subarch="sparc64"
     ;;
+    tilegx|tile-gx)
+        arch="tilegx"
+    ;;
     i[3-6]86|i86pc|BePC|x86pc|x86_64|amd64)
         arch="x86"
     ;;