# HG changeset patch
# User Chris Cannam
# Date 1364464936 0
# Node ID 8e8d0f1f4f859c8069443403a56c4694c8f6935c
# Parent  711a4652d616dfe0ec1845d5fac6f53ef9c4efa1# Parent  459235dccff6d4d5f2190131b6f5826a77b3cde7
Merge from default branch

diff -r 711a4652d616 -r 8e8d0f1f4f85 data/fileio/WavFileReader.cpp
--- a/data/fileio/WavFileReader.cpp	Wed Mar 27 17:21:58 2013 +0000
+++ b/data/fileio/WavFileReader.cpp	Thu Mar 28 10:02:16 2013 +0000
@@ -185,7 +185,14 @@
     for (int i = 0; i < count; ++i) {
         info.format = i;
         if (!sf_command(0, SFC_GET_FORMAT_MAJOR, &info, sizeof(info))) {
-            extensions.insert(QString(info.extension).toLower());
+            QString ext = QString(info.extension).toLower();
+            extensions.insert(ext);
+            if (ext == "oga") {
+                // libsndfile is awfully proper, it says it only
+                // supports .oga but lots of Ogg audio files in the
+                // wild are .ogg and it will accept that
+                extensions.insert("ogg");
+            }
         }
     }
 }