# HG changeset patch # User Chris Cannam # Date 1561039100 -3600 # Node ID 649ac57c5a2dee598aa00eaa29a2d58a7e404575 # Parent 8efce64dd85ec5669cf094df639996eddb0bc78f# Parent a47a23c824ac5f5983e7f1e02b63b5f5a5eb75e5 Merge diff -r 8efce64dd85e -r 649ac57c5a2d data/fileio/test/UnsupportedFormat.cpp --- a/data/fileio/test/UnsupportedFormat.cpp Thu Jun 20 11:09:36 2019 +0100 +++ b/data/fileio/test/UnsupportedFormat.cpp Thu Jun 20 14:58:20 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");