Mercurial > hg > svcore

changeset 1728:a47a23c824ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Wed, 22 May 2019 15:37:44 +0100
parents 417528c41e66 (current diff) 219b2c2ff8c2 (diff)
children 649ac57c5a2d
files data/fileio/test/UnsupportedFormat.cpp data/fileio/test/UnsupportedFormat.h
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/test/UnsupportedFormat.cpp	Fri May 17 12:41:06 2019 +0100
+++ b/data/fileio/test/UnsupportedFormat.cpp	Wed May 22 15:37:44 2019 +0100
@@ -24,6 +24,15 @@
 UnsupportedFormat::isLegitimatelyUnsupported(QString format)
 {
 #ifdef Q_OS_WIN
+
+    if (sizeof(void *) == 4) {
+        // Our 32-bit MinGW build lacks MediaFoundation support
+        return (format == "aac" ||
+                format == "apple_lossless" ||
+                format == "m4a" ||
+                format == "wma");
+    }
+
     // Our CI tests run on Windows Server, which annoyingly seems to
     // come without codecs for WMA and AAC
     
@@ -49,6 +58,9 @@
         std::cerr << "WARNING: Failed to find RtlGetVersion in NTDLL"
                   << std::endl;
     }
+
+    // If none of the above applies, then we should have everything
+    // except this:
     
     return (format == "apple_lossless");