Bug 1107264 - Enable the use of FFmpeg on mac. r=k17e, a=sledru
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 03 Dec 2014 14:41:49 -0800
changeset 234340 8408727d213edfb81df2be9dd945a6533a43e3f5
parent 234339 683b0185016af350adbbb14611a8f990c9f7d525
child 234341 383f4f363da32c53a190cb16303869eb06cdc42d
push id7368
push userrgiles@mozilla.com
push dateMon, 15 Dec 2014 23:29:16 +0000
treeherdermozilla-aurora@8408727d213e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersk17e, sledru
bugs1107264
milestone36.0a2
Bug 1107264 - Enable the use of FFmpeg on mac. r=k17e, a=sledru
dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
--- a/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
+++ b/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
@@ -31,16 +31,20 @@ public:
   static PlatformDecoderModule* Create();
 };
 
 static const AvFormatLib sLibs[] = {
   { "libavformat.so.56", FFmpegDecoderModule<55>::Create, 55 },
   { "libavformat.so.55", FFmpegDecoderModule<55>::Create, 55 },
   { "libavformat.so.54", FFmpegDecoderModule<54>::Create, 54 },
   { "libavformat.so.53", FFmpegDecoderModule<53>::Create, 53 },
+  { "libavformat.56.dylib", FFmpegDecoderModule<55>::Create, 55 },
+  { "libavformat.55.dylib", FFmpegDecoderModule<55>::Create, 55 },
+  { "libavformat.54.dylib", FFmpegDecoderModule<54>::Create, 54 },
+  { "libavformat.53.dylib", FFmpegDecoderModule<53>::Create, 53 },
 };
 
 void* FFmpegRuntimeLinker::sLinkedLib = nullptr;
 const AvFormatLib* FFmpegRuntimeLinker::sLib = nullptr;
 
 #define AV_FUNC(func, ver) void (*func)();
 #define LIBAVCODEC_ALLVERSION
 #include "FFmpegFunctionList.h"