diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-10-24 11:13:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-10-24 11:13:33 +0200 |
| commit | 579881ffb4aa0b145c793825cd1b0628e7cd6cdc (patch) | |
| tree | 65d59fc6b73f120ac1bc2214d4a8442421076b04 /dom/media/platforms/ffmpeg | |
| parent | a02c44648a3f7d6f3904eebba026ce5e6f781bef (diff) | |
| parent | f71c04d814416ebf52dd54109f2d04f1cbd397c0 (diff) | |
| download | UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.gz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.lz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.xz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'dom/media/platforms/ffmpeg')
| -rw-r--r-- | dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp | 1 | ||||
| -rw-r--r-- | dom/media/platforms/ffmpeg/FFmpegLibWrapper.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp index 6302882a6..e1c326818 100644 --- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp @@ -7,6 +7,7 @@ #include "MediaPrefs.h" #include "mozilla/PodOperations.h" #include "mozilla/Types.h" +#include "PlatformDecoderModule.h" #include "prlink.h" #define AV_LOG_DEBUG 48 diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h index d6944a1d8..c6c43a4ae 100644 --- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h +++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h @@ -5,6 +5,7 @@ #ifndef __FFmpegLibWrapper_h__ #define __FFmpegLibWrapper_h__ +#include "mozilla/Attributes.h" #include "mozilla/Types.h" struct AVCodec; @@ -91,4 +92,4 @@ private: } // namespace mozilla -#endif // FFmpegLibWrapper
\ No newline at end of file +#endif // FFmpegLibWrapper |