From 7a39cd52e5c39f95fb8351a1501e07c9c1aae947 Mon Sep 17 00:00:00 2001 From: trav90 Date: Mon, 31 Dec 2018 09:14:59 -0600 Subject: Avoid redefined macro warning in MediaFormatReader --- dom/media/MediaFormatReader.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp index 06e8b963b..773434710 100644 --- a/dom/media/MediaFormatReader.cpp +++ b/dom/media/MediaFormatReader.cpp @@ -32,6 +32,10 @@ using mozilla::layers::Image; using mozilla::layers::LayerManager; using mozilla::layers::LayersBackend; +// avoid redefined macro warning in unified builds +#undef LOG +#undef LOGV + static mozilla::LazyLogModule sFormatDecoderLog("MediaFormatReader"); mozilla::LazyLogModule gMediaDemuxerLog("MediaDemuxer"); -- cgit v1.2.3