summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-12-31 09:14:59 -0600
committertrav90 <travawine@palemoon.org>2018-12-31 09:16:10 -0600
commit7a39cd52e5c39f95fb8351a1501e07c9c1aae947 (patch)
tree9e5a4a7dbe307923ae8d6f76971759610e4db3de
parent68acfbb14b48a988e68e056a1d3376cef0f6fba6 (diff)
downloadUXP-7a39cd52e5c39f95fb8351a1501e07c9c1aae947.tar
UXP-7a39cd52e5c39f95fb8351a1501e07c9c1aae947.tar.gz
UXP-7a39cd52e5c39f95fb8351a1501e07c9c1aae947.tar.lz
UXP-7a39cd52e5c39f95fb8351a1501e07c9c1aae947.tar.xz
UXP-7a39cd52e5c39f95fb8351a1501e07c9c1aae947.zip
Avoid redefined macro warning in MediaFormatReader
-rw-r--r--dom/media/MediaFormatReader.cpp4
1 files changed, 4 insertions, 0 deletions
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");