diff options
author | Moonchild <moonchild@palemoon.org> | 2020-04-22 02:32:20 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-04-22 02:32:20 +0000 |
commit | b5b62d841c733dcb62112f3158f1488e670671d6 (patch) | |
tree | 6a83353eed59e416073ead6cbd8661d389d7f9a6 /dom/media/MediaDecoder.cpp | |
parent | c9bde0ff25540e6e3a41638c982cc7a575659487 (diff) | |
download | UXP-b5b62d841c733dcb62112f3158f1488e670671d6.tar UXP-b5b62d841c733dcb62112f3158f1488e670671d6.tar.gz UXP-b5b62d841c733dcb62112f3158f1488e670671d6.tar.lz UXP-b5b62d841c733dcb62112f3158f1488e670671d6.tar.xz UXP-b5b62d841c733dcb62112f3158f1488e670671d6.zip |
Issue #80 - De-unify dom/media part 1
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() { |