From 400e9018fd5b1b8e50ba5ea403ba98f9a658c076 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 22 Apr 2020 15:14:53 +0200
Subject: Revert "Issue #80 - De-unify dom/media part 1"

This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6.
---
 dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 1 -
 dom/media/platforms/agnostic/gmp/moz.build           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'dom/media/platforms/agnostic/gmp')

diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
index 26d029da0..912b88ce1 100644
--- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
+++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
@@ -10,7 +10,6 @@
 #include "prsystem.h"
 #include "MediaData.h"
 #include "GMPDecoderModule.h"
-#include "MP4Decoder.h"
 #include "VPXDecoder.h"
 
 namespace mozilla {
diff --git a/dom/media/platforms/agnostic/gmp/moz.build b/dom/media/platforms/agnostic/gmp/moz.build
index 644df47a3..eb2738e26 100644
--- a/dom/media/platforms/agnostic/gmp/moz.build
+++ b/dom/media/platforms/agnostic/gmp/moz.build
@@ -11,7 +11,7 @@ EXPORTS += [
     'MediaDataDecoderProxy.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'GMPAudioDecoder.cpp',
     'GMPDecoderModule.cpp',
     'GMPVideoDecoder.cpp',
-- 
cgit v1.2.3