applied myffmpegXP-20180121.diff

dom/media/fmp4/MP4Decoder.cpp

@@ -52,7 +52,7 @@ IsWhitelistedH264Codec(const nsAString& aCodec)
     return false;
   }
 
-#ifdef XP_WIN
+#if 0
   if (!Preferences::GetBool("media.use-blank-decoder") &&
       !WMFDecoderModule::HasH264()) {
     return false;
@@ -228,19 +228,18 @@ IsGMPDecoderAvailable()
 static bool
 HavePlatformMPEGDecoders()
 {
-#ifdef XP_WIN
-  // We always have H.264/AAC platform decoders on Windows.
-  return true;
-#else
   return Preferences::GetBool("media.use-blank-decoder") ||
-         IsAndroidAvailable() ||
+#ifdef XP_WIN
+         // We have H.264/AAC platform decoders on Windows Vista and up.
          IsFFmpegAvailable() ||
+         IsVistaOrLater() ||
+#endif
+         IsAndroidAvailable() ||
          IsAppleAvailable() ||
          IsGonkMP4DecoderAvailable() ||
          IsGMPDecoderAvailable() ||
          // TODO: Other platforms...
          false;
-#endif
 }
 
 /* static */