Backed out changeset 9172b8d6ce3e (bug 1390748)

--HG--
extra : rebase_source : 44c2361c7247fe7d1948ff3e7f47f165e8368483

dom/media/eme/MediaKeySystemAccess.cpp

@@ -10,6 +10,9 @@
 #include "mozilla/Preferences.h"
 #include "MediaContainerType.h"
 #include "MediaPrefs.h"
+#ifdef MOZ_FMP4
+#include "MP4Decoder.h"
+#endif
 #ifdef XP_WIN
 #include "WMFDecoderModule.h"
 #endif

dom/media/eme/MediaKeys.cpp

@@ -23,6 +23,9 @@
 #include "nsContentUtils.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsContentTypeParser.h"
+#ifdef MOZ_FMP4
+#include "MP4Decoder.h"
+#endif
 #ifdef XP_WIN
 #include "mozilla/WindowsVersion.h"
 #endif

dom/media/gtest/TestMediaDataDecoder.cpp

@@ -8,6 +8,7 @@
 #include "MockMediaResource.h"
 #include "DecoderTraits.h"
 #include "MediaContainerType.h"
+#include "MP4Decoder.h"
 #include "MP4Demuxer.h"
 #include "WebMDecoder.h"
 #include "WebMDemuxer.h"

dom/media/platforms/agnostic/eme/EMEDecoderModule.cpp

@@ -8,6 +8,7 @@
 #include "EMEVideoDecoder.h"
 #include "GMPDecoderModule.h"
 #include "GMPService.h"
+#include "MP4Decoder.h"
 #include "MediaInfo.h"
 #include "MediaPrefs.h"
 #include "PDMFactory.h"