Bug 1197777 - Use libavformat-ffmpeg.so.56 if available. r=k17e
authorJan Gerber <j@mailb.org>
Mon, 24 Aug 2015 14:08:09 +0200
changeset 288054 aee2399633fadaca5a8ffd10cefc8768f7b88c5d
parent 288053 adab97506c343756651670bb9e8486e8ee676ae5
child 288055 fd4a578a82d49ca5ec5e98cc93ecbd08869918ee
push id4792
push useryura.zenevich@gmail.com
push dateWed, 26 Aug 2015 20:00:52 +0000
reviewersk17e
bugs1197777
milestone43.0a1
Bug 1197777 - Use libavformat-ffmpeg.so.56 if available. r=k17e
dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
--- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
@@ -27,16 +27,17 @@ struct AvFormatLib
 
 template <int V> class FFmpegDecoderModule
 {
 public:
   static already_AddRefed<PlatformDecoderModule> Create();
 };
 
 static const AvFormatLib sLibs[] = {
+  { "libavformat-ffmpeg.so.56", FFmpegDecoderModule<55>::Create, 55 },
   { "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 },