summaryrefslogtreecommitdiffstats
path: root/dom/media/fmp4
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-08-13 22:45:09 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-02-03 23:42:52 +0100
commit99118e38e1a9f2ba3b48ed61ab7cc85610c9712f (patch)
tree6b7ef33a5b1546a82689437e33ff95e9cf8ff79f /dom/media/fmp4
parenta595451104a9ea155703899ab8fbc9f37547bcd9 (diff)
downloadUXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar
UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.gz
UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.lz
UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.tar.xz
UXP-99118e38e1a9f2ba3b48ed61ab7cc85610c9712f.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')
-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"