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/MediaDecoder.cpp | |
| 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/MediaDecoder.cpp')
| -rw-r--r-- | dom/media/MediaDecoder.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp index b1f2f95d7..0cce91ccb 100644 --- a/dom/media/MediaDecoder.cpp +++ b/dom/media/MediaDecoder.cpp @@ -788,13 +788,6 @@ 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() { |