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"
     ;;
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index fff3d055df..7a54b1b8ed 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -223,7 +223,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;
@@ -340,12 +340,11 @@ static int wav_read_header(AVFormatContext *s)
             wav->smv_frames_per_jpeg = avio_rl24(pb);
             goto break_loop;
         case MKTAG('L', 'I', 'S', 'T'):
-            list_type = avio_rl32(pb);
             if (size < 4) {
                 av_log(s, AV_LOG_ERROR, "too short LIST tag\n");
                 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;