summaryrefslogtreecommitdiffstats
path: root/dom/media/fmp4/MP4Decoder.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-08-13 22:45:09 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:29:16 +0200
commit37e3135bc5cf853f94e9d0d9ba706277a25db928 (patch)
tree5b7154274de8ed438765a7ef44c4bc0eb2b8249f /dom/media/fmp4/MP4Decoder.cpp
parent259bd2e9770625fb4054298874a0200ad17b4354 (diff)
downloadUXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.tar
UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.tar.gz
UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.tar.lz
UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.tar.xz
UXP-37e3135bc5cf853f94e9d0d9ba706277a25db928.zip
Issue #26 Part 2a: make more EME code conditional.
- Exclude missed MediaKey functions and CDMProxy code. - Exclude EME APIs frm being built (webidl change) - Fix tests in --disable-eme state
Diffstat (limited to 'dom/media/fmp4/MP4Decoder.cpp')
-rw-r--r--dom/media/fmp4/MP4Decoder.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/dom/media/fmp4/MP4Decoder.cpp b/dom/media/fmp4/MP4Decoder.cpp
index b293c251b..bf937241c 100644
--- a/dom/media/fmp4/MP4Decoder.cpp
+++ b/dom/media/fmp4/MP4Decoder.cpp
@@ -10,7 +10,9 @@
#include "MP4Demuxer.h"
#include "mozilla/Preferences.h"
#include "nsCharSeparatedTokenizer.h"
+#ifdef MOZ_EME
#include "mozilla/CDMProxy.h"
+#endif
#include "mozilla/Logging.h"
#include "mozilla/SharedThreadPool.h"
#include "nsMimeTypes.h"