diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-04-22 02:32:20 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-03 11:49:58 +0000 |
| commit | 5a64ee34a9e5242bbe5fe4e509ef38ef42f360fa (patch) | |
| tree | 648f0ce4febbee2f901ef6af74385df8ce452eee /dom/media/MediaDecoder.cpp | |
| parent | da8fbfb4d56a4800b3e4c134ea387c2d9fcd9df7 (diff) | |
| download | UXP-5a64ee34a9e5242bbe5fe4e509ef38ef42f360fa.tar UXP-5a64ee34a9e5242bbe5fe4e509ef38ef42f360fa.tar.gz UXP-5a64ee34a9e5242bbe5fe4e509ef38ef42f360fa.tar.lz UXP-5a64ee34a9e5242bbe5fe4e509ef38ef42f360fa.tar.xz UXP-5a64ee34a9e5242bbe5fe4e509ef38ef42f360fa.zip | |
Issue #80 - Re-land early dom/media de-unification with fixups.
For some reason these changes never got merged back to master
after reverting to work on a branch...
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() { |