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/FFmpegLibWrapper.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/FFmpegLibWrapper.cpp')
| -rw-r--r-- | dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp index f3dc00ad7..6302882a6 100644 --- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp @@ -69,12 +69,14 @@ FFmpegLibWrapper::Link() AV_FUNC_55 = 1 << 2, AV_FUNC_56 = 1 << 3, AV_FUNC_57 = 1 << 4, + AV_FUNC_58 = 1 << 5, AV_FUNC_AVUTIL_53 = AV_FUNC_53 | AV_FUNC_AVUTIL_MASK, AV_FUNC_AVUTIL_54 = AV_FUNC_54 | AV_FUNC_AVUTIL_MASK, AV_FUNC_AVUTIL_55 = AV_FUNC_55 | AV_FUNC_AVUTIL_MASK, AV_FUNC_AVUTIL_56 = AV_FUNC_56 | AV_FUNC_AVUTIL_MASK, AV_FUNC_AVUTIL_57 = AV_FUNC_57 | AV_FUNC_AVUTIL_MASK, - AV_FUNC_AVCODEC_ALL = AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57, + AV_FUNC_AVUTIL_58 = AV_FUNC_58 | AV_FUNC_AVUTIL_MASK, + AV_FUNC_AVCODEC_ALL = AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58, AV_FUNC_AVUTIL_ALL = AV_FUNC_AVCODEC_ALL | AV_FUNC_AVUTIL_MASK }; @@ -94,6 +96,9 @@ FFmpegLibWrapper::Link() case 57: version = AV_FUNC_57; break; + case 58: + version = AV_FUNC_58; + break; default: FFMPEG_LOG("Unknown avcodec version"); Unlink(); @@ -142,9 +147,9 @@ FFmpegLibWrapper::Link() AV_FUNC(av_log_set_level, AV_FUNC_AVUTIL_ALL) AV_FUNC(av_malloc, AV_FUNC_AVUTIL_ALL) AV_FUNC(av_freep, AV_FUNC_AVUTIL_ALL) - AV_FUNC(av_frame_alloc, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57)) - AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57)) - AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57)) + AV_FUNC(av_frame_alloc, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) + AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) + AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) AV_FUNC_OPTION(av_frame_get_colorspace, AV_FUNC_AVUTIL_ALL) #undef AV_FUNC #undef AV_FUNC_OPTION @@ -175,4 +180,4 @@ FFmpegLibWrapper::Unlink() PodZero(this); } -} // namespace mozilla
\ No newline at end of file +} // namespace mozilla |