diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-03 07:10:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 07:10:28 +0200 |
| commit | 20532e13937ab5fc8efcb2bfc4c0070dace40cd1 (patch) | |
| tree | 487982dc05c566582b484cbea7dacec3f8d87a6b /dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | |
| parent | b1728772a796834e7bd9e6707e8855bee49b5368 (diff) | |
| parent | 29c293b100e046eaf82ceadbf676c0226b0e9e82 (diff) | |
| download | UXP-20532e13937ab5fc8efcb2bfc4c0070dace40cd1.tar UXP-20532e13937ab5fc8efcb2bfc4c0070dace40cd1.tar.gz UXP-20532e13937ab5fc8efcb2bfc4c0070dace40cd1.tar.lz UXP-20532e13937ab5fc8efcb2bfc4c0070dace40cd1.tar.xz UXP-20532e13937ab5fc8efcb2bfc4c0070dace40cd1.zip | |
Merge pull request #322 from trav90/ffmpeg-work
Add support for FFmpeg 4.0/libavcodec 58
Diffstat (limited to 'dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp')
| -rw-r--r-- | dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp index fdbe77ef7..4671499e5 100644 --- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp @@ -27,12 +27,15 @@ 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", "libavcodec-ffmpeg.so.56", "libavcodec.so.57", @@ -134,6 +137,7 @@ FFmpegRuntimeLinker::CreateDecoderModule() case 55: case 56: module = FFmpegDecoderModule<55>::Create(&sLibAV); break; case 57: module = FFmpegDecoderModule<57>::Create(&sLibAV); break; + case 58: module = FFmpegDecoderModule<58>::Create(&sLibAV); break; default: module = nullptr; } return module.forget(); |