diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-22 15:14:53 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-22 15:14:53 +0200 |
| commit | 400e9018fd5b1b8e50ba5ea403ba98f9a658c076 (patch) | |
| tree | d43e5e71790e07a7535eab9067ecd72f9881fc53 /dom/media/platforms/agnostic | |
| parent | b5b62d841c733dcb62112f3158f1488e670671d6 (diff) | |
| download | UXP-400e9018fd5b1b8e50ba5ea403ba98f9a658c076.tar UXP-400e9018fd5b1b8e50ba5ea403ba98f9a658c076.tar.gz UXP-400e9018fd5b1b8e50ba5ea403ba98f9a658c076.tar.lz UXP-400e9018fd5b1b8e50ba5ea403ba98f9a658c076.tar.xz UXP-400e9018fd5b1b8e50ba5ea403ba98f9a658c076.zip | |
Revert "Issue #80 - De-unify dom/media part 1"
This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6.
Diffstat (limited to 'dom/media/platforms/agnostic')
| -rw-r--r-- | dom/media/platforms/agnostic/TheoraDecoder.cpp | 1 | ||||
| -rw-r--r-- | dom/media/platforms/agnostic/eme/moz.build | 2 | ||||
| -rw-r--r-- | dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 1 | ||||
| -rw-r--r-- | dom/media/platforms/agnostic/gmp/moz.build | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/dom/media/platforms/agnostic/TheoraDecoder.cpp b/dom/media/platforms/agnostic/TheoraDecoder.cpp index 695e697d7..b216791e4 100644 --- a/dom/media/platforms/agnostic/TheoraDecoder.cpp +++ b/dom/media/platforms/agnostic/TheoraDecoder.cpp @@ -10,7 +10,6 @@ #include "nsError.h" #include "TimeUnits.h" #include "mozilla/PodOperations.h" -#include "mozilla/SyncRunnable.h" #include <algorithm> diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build index e48d49d80..78b76d4d4 100644 --- a/dom/media/platforms/agnostic/eme/moz.build +++ b/dom/media/platforms/agnostic/eme/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'SamplesWaitingForKey.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'EMEAudioDecoder.cpp', 'EMEDecoderModule.cpp', 'EMEVideoDecoder.cpp', 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', |