diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
| commit | 98fe8b0ccbea37c2681ad8c788baa91554871f4d (patch) | |
| tree | 0e269a27661fea619ab07a533e0c1fa195c3c671 /dom/media/ogg | |
| parent | e08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff) | |
| parent | 519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff) | |
| download | UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.gz UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.lz UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.xz UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.zip | |
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'dom/media/ogg')
| -rw-r--r-- | dom/media/ogg/OggDemuxer.cpp | 1 | ||||
| -rw-r--r-- | dom/media/ogg/moz.build | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/dom/media/ogg/OggDemuxer.cpp b/dom/media/ogg/OggDemuxer.cpp index 0cc484687..f9475700a 100644 --- a/dom/media/ogg/OggDemuxer.cpp +++ b/dom/media/ogg/OggDemuxer.cpp @@ -21,6 +21,7 @@ #include <algorithm> extern mozilla::LazyLogModule gMediaDemuxerLog; +#define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg) #define OGG_DEBUG(arg, ...) MOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, ("OggDemuxer(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) // Un-comment to enable logging of seek bisections. diff --git a/dom/media/ogg/moz.build b/dom/media/ogg/moz.build index 07e195b6f..c47abf690 100644 --- a/dom/media/ogg/moz.build +++ b/dom/media/ogg/moz.build @@ -13,7 +13,7 @@ EXPORTS += [ 'OpusParser.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'OggCodecState.cpp', 'OggCodecStore.cpp', 'OggDecoder.cpp', |