Merge remote-tracking branch 'origin/tracking' into custom

dom/media/platforms/ffmpeg/FFmpegDecoderModule.h

@@ -77,6 +77,21 @@ public:
     }
   }
 
+protected:
+  bool SupportsBitDepth(const uint8_t aBitDepth,
+                        DecoderDoctorDiagnostics* aDiagnostics) const override
+  {
+    // We don't support bitDepth > 8 when compositor backend is D3D11.
+    // But we don't have KnowsCompositor or any object
+    // that we can ask for the layersbackend type.
+    // We should remove this restriction until
+    // we solve the D3D11 compositor backend issue.
+#if defined(XP_LINUX) || defined(XP_MACOSX)
+    return true;
+#endif
+    return aBitDepth == 8;
+  }
+
 private:
   FFmpegLibWrapper* mLib;
 };

dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp

@@ -26,6 +26,14 @@ public:
 static FFmpegLibWrapper sLibAV;
 
 static const char* sLibs[] = {
+#if defined(XP_DARWIN)
+  "libavcodec.58.dylib",
+  "libavcodec.57.dylib",
+  "libavcodec.56.dylib",
+  "libavcodec.55.dylib",
+  "libavcodec.54.dylib",
+  "libavcodec.53.dylib",
+#else
   "libavcodec.so.58",
   "libavcodec-ffmpeg.so.58",
   "libavcodec-ffmpeg.so.57",
@@ -35,6 +43,7 @@ static const char* sLibs[] = {
   "libavcodec.so.55",
   "libavcodec.so.54",
   "libavcodec.so.53",
+#endif
 };
 
 /* static */ bool