diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-04-22 02:32:20 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 10:18:28 +0200 |
| commit | b738ccc61b05e4848c0e8d0400a8aee770f591a2 (patch) | |
| tree | 9d582273d9295a610f8e9d86f1ff20282c570fd0 /dom/media/MediaDecoder.cpp | |
| parent | 1c3a9a40e5450c2b39f0cea1ffa9143b72931fe9 (diff) | |
| download | UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.tar UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.tar.gz UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.tar.lz UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.tar.xz UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.zip | |
Issue #80 - De-unify dom/media part 1 (updated reland)
This de-unifies up to and including dom/media/platforms with the exception of
dom/media/platforms/wmf, because that one throws weird errors in the Win
SDK which don't have a clear cause (yet)
Diffstat (limited to 'dom/media/MediaDecoder.cpp')
| -rw-r--r-- | dom/media/MediaDecoder.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp index 0cce91ccb..b1f2f95d7 100644 --- a/dom/media/MediaDecoder.cpp +++ b/dom/media/MediaDecoder.cpp @@ -788,6 +788,13 @@ MediaDecoder::CallSeek(const SeekTarget& aTarget, dom::Promise* aPromise) &MediaDecoder::OnSeekResolved, &MediaDecoder::OnSeekRejected)); } +// GetCurrentTime is defined in winbase.h as a zero argument macro forwarding to +// GetTickCount(), which conflicts with the MediaDecoder::GetCurrentTime +// implementation here. Clear the macro. +#ifdef GetCurrentTime +#undef GetCurrentTime +#endif + double MediaDecoder::GetCurrentTime() { |