diff options
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() { |